From 3177de92fbd70901e8da8da80d6f343ddda785e2 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 7 Jul 2004 01:15:04 +0000
Subject: [PATCH] New ACC version.

committer: mfx <mfx> 1089162904 +0000
---
 src/acc/acc.h      | 2 +-
 src/acc/acc_auto.h | 3 +++
 src/acc/acc_chk.ch | 7 ++++++-
 src/acc/acc_defs.h | 4 +++-
 src/acc/acc_lib.h  | 4 ----
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/acc/acc.h b/src/acc/acc.h
index 5cfcfe9f..1d53501b 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     20040701L
+#define ACC_VERSION     20040706L
 
 #if !defined(ACC_CONFIG_INCLUDE)
 #  define ACC_CONFIG_INCLUDE(file)     file
diff --git a/src/acc/acc_auto.h b/src/acc/acc_auto.h
index 4ac4a09f..81dcc069 100644
--- a/src/acc/acc_auto.h
+++ b/src/acc/acc_auto.h
@@ -625,6 +625,9 @@
 #elif (ACC_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && (_INTEGRAL_MAX_BITS == 64))
 #  define SIZEOF___INT64            8
 #  define SIZEOF_UNSIGNED___INT64   8
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#  define SIZEOF_LONG_LONG          8
+#  define SIZEOF_UNSIGNED_LONG_LONG 8
 #endif
 #endif
 
diff --git a/src/acc/acc_chk.ch b/src/acc/acc_chk.ch
index f9e77ea7..a95ae7d9 100644
--- a/src/acc/acc_chk.ch
+++ b/src/acc/acc_chk.ch
@@ -344,14 +344,19 @@
 #endif /* ACCCHK_CONFIG_PEDANTIC */
     ACCCHK_ASSERT((ACC_INT64L_C(1)  << (8*SIZEOF_ACC_INT64L_T-1)) < 0)
     ACCCHK_ASSERT((ACC_UINT64L_C(1) << (8*SIZEOF_ACC_INT64L_T-1)) > 0)
+#if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020600ul))
+    /* avoid pedantic warning */
+    ACCCHK_ASSERT(ACC_INT64L_C(9223372036854775807)       > ACC_INT64L_C(0))
+#else
     ACCCHK_ASSERT(ACC_INT64L_C(9223372036854775807)       > 0)
+#endif
     ACCCHK_ASSERT(ACC_INT64L_C(-9223372036854775807) - 1  < 0)
 
     ACCCHK_ASSERT( ACC_INT64L_C(9223372036854775807) % 2147483629l  == 721)
     ACCCHK_ASSERT( ACC_INT64L_C(9223372036854775807) % 2147483647l  == 1)
     ACCCHK_ASSERT(ACC_UINT64L_C(9223372036854775807) % 2147483629ul == 721)
     ACCCHK_ASSERT(ACC_UINT64L_C(9223372036854775807) % 2147483647ul == 1)
-#endif
+#endif /* acc_int64l_t */
 
 
     ACCCHK_ASSERT_IS_SIGNED_T(acc_intptr_t)
diff --git a/src/acc/acc_defs.h b/src/acc/acc_defs.h
index bdd810fd..3ae1fe09 100644
--- a/src/acc/acc_defs.h
+++ b/src/acc/acc_defs.h
@@ -71,10 +71,12 @@
 #    define ACC_UNUSED_FUNC(func)   ((void) func)
 #  elif (ACC_CC_BORLANDC || ACC_CC_NDPC || ACC_CC_TURBOC)
 #    define ACC_UNUSED_FUNC(func)   if (func) ; else
+#  elif (ACC_CC_GNUC == 0x030400ul) && defined(__llvm__)
+#    define ACC_UNUSED_FUNC(func)   ((void) (void (*)(void)) func)
 #  elif (ACC_CC_MSC && (_MSC_VER < 900))
 #    define ACC_UNUSED_FUNC(func)   if (func) ; else
 #  elif (ACC_CC_MSC && (_MSC_VER >= 1400))
-#    define ACC_UNUSED_FUNC(func)   ((void) (void (*)()) func)
+#    define ACC_UNUSED_FUNC(func)   ((void) (void (*)(void)) func)
 #  elif (ACC_CC_KEILC)
 #    define ACC_UNUSED_FUNC(func)
 #  else
diff --git a/src/acc/acc_lib.h b/src/acc/acc_lib.h
index 8d7c0b17..0b48e756 100644
--- a/src/acc/acc_lib.h
+++ b/src/acc/acc_lib.h
@@ -369,13 +369,9 @@ ACCLIB_EXTERN(double, acc_uclock_get_elapsed) (acc_uclock_handle_p, const acc_uc
 #if defined(acc_int64l_t)
 
 typedef struct { /* all private */
-#if (ACC_OS_POSIX_LINUX)
     void* h;
     unsigned cpu_type, cpu_features, cpu_khz, cpu_nrctrs;
     const char* cpu_name;
-#else
-    void* h;
-#endif
 } acc_perfctr_handle_t;
 
 typedef struct {