From 07230edec0b70ae16b94d67e4b7506f9c84cf366 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 25 Nov 2003 19:12:28 +0000
Subject: [PATCH] New ACC version.

committer: mfx <mfx> 1069787548 +0000
---
 src/acc/acc.h      |  2 +-
 src/acc/acc_chk.ch |  5 ++++-
 src/acc/acc_cxx.h  |  4 ++++
 src/acc/acc_defs.h | 19 +++++++++++++++++--
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/acc/acc.h b/src/acc/acc.h
index b5d82456..ae14ab14 100644
--- a/src/acc/acc.h
+++ b/src/acc/acc.h
@@ -27,7 +27,7 @@
 #ifndef __ACC_H_INCLUDED
 #define __ACC_H_INCLUDED 1
 
-#define ACC_VERSION     20031115L
+#define ACC_VERSION     20031125L
 
 #if !defined(ACC_CONFIG_INCLUDE)
 #  define ACC_CONFIG_INCLUDE(file)     file
diff --git a/src/acc/acc_chk.ch b/src/acc/acc_chk.ch
index e5bd238d..f434ad2b 100644
--- a/src/acc/acc_chk.ch
+++ b/src/acc/acc_chk.ch
@@ -352,12 +352,15 @@
 
 #if (ACC_ARCH_IA16)
     ACCCHK_ASSERT(sizeof(size_t) == 2)
-#elif (ACC_ARCH_IA32)
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
+#elif (ACC_ARCH_IA32 || ACC_ARCH_M68K)
     ACCCHK_ASSERT(sizeof(size_t) == 4)
     ACCCHK_ASSERT(sizeof(ptrdiff_t) == 4)
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
 #elif (ACC_ARCH_AMD64 || ACC_ARCH_IA64)
     ACCCHK_ASSERT(sizeof(size_t) == 8)
     ACCCHK_ASSERT(sizeof(ptrdiff_t) == 8)
+    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
 #endif
 
 #if (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_WIN32)
diff --git a/src/acc/acc_cxx.h b/src/acc/acc_cxx.h
index d831b38d..8ad6dd57 100644
--- a/src/acc/acc_cxx.h
+++ b/src/acc/acc_cxx.h
@@ -117,6 +117,10 @@
 #  define ACC_CXX_DISABLE_NEW_DELETE private:
 #endif
 
+#if !defined(ACC_CXX_DISABLE_NEW_DELETE) && (ACC_CC_GNUC && (ACC_CC_GNUC < 0x025b00ul))
+#  define ACC_CXX_DISABLE_NEW_DELETE private:
+#endif
+
 #if !defined(ACC_CXX_DISABLE_NEW_DELETE) && !(__ACC_CXX_HAVE_ARRAY_NEW)
 /* for old compilers use `protected' instead of `private' */
 #  define ACC_CXX_DISABLE_NEW_DELETE \
diff --git a/src/acc/acc_defs.h b/src/acc/acc_defs.h
index 484ede6c..d9cbb79d 100644
--- a/src/acc/acc_defs.h
+++ b/src/acc/acc_defs.h
@@ -47,10 +47,10 @@
 #if !defined(ACC_COMPILE_TIME_ASSERT_HEADER)
 #  if (ACC_CC_AZTECC || ACC_CC_ZORTECHC)
 #    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
-#  elif (ACC_CC_TURBOC && (__TURBOC__ == 0x0295))
-#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
 #  elif (ACC_CC_DMC || ACC_CC_SYMANTECC)
 #    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1u-2*!(e)];
+#  elif (ACC_CC_TURBOC && (__TURBOC__ == 0x0295))
+#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
 #  else
 #    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-2*!(e)];
 #  endif
@@ -139,6 +139,21 @@
 #  define acc_alignof(e)        __alignof(e)
 #endif
 
+#if (ACC_CC_TURBOC && (__TURBOC__ <= 0x0295))
+#elif defined(__cplusplus)
+#  define acc_inline            inline
+#elif (ACC_CC_BORLANDC && ACC_MM_FLAT && (__BORLANDC__ >= 0x0500))
+#  define acc_inline            __inline
+#elif (ACC_CC_DMC)
+#  define acc_inline            __inline
+#elif (ACC_CC_GNUC)
+#  define acc_inline            __inline__
+#elif (ACC_CC_INTELC)
+#  define acc_inline            __inline
+#elif (ACC_CC_MSC && (_MSC_VER >= 1000))
+#  define acc_inline            __inline
+#endif
+
 
 
 /*