From 6662f8985ec86d230b12afa9c89f6f77c2af7c95 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Mon, 19 Jul 2004 16:16:07 +0000 Subject: [PATCH] New ACC version. committer: mfx 1090253767 +0000 --- src/acc/acc.h | 2 +- src/acc/acc_defs.h | 8 ++++---- src/acc/acclib/uclock.ch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/acc/acc.h b/src/acc/acc.h index a9600c78..9286b9bf 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 20040713L +#define ACC_VERSION 20040715L #if !defined(ACC_CONFIG_INCLUDE) # define ACC_CONFIG_INCLUDE(file) file diff --git a/src/acc/acc_defs.h b/src/acc/acc_defs.h index 880f3c91..866b7bdb 100644 --- a/src/acc/acc_defs.h +++ b/src/acc/acc_defs.h @@ -36,7 +36,7 @@ # define acc_inline __inline #elif (ACC_CC_INTELC) # define acc_inline __inline -#elif (ACC_CC_MSC && (_MSC_VER >= 1000)) +#elif (ACC_CC_MSC && (_MSC_VER >= 900)) # define acc_inline __inline #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) # define acc_inline inline @@ -68,11 +68,11 @@ # 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) +# define ACC_UNUSED_FUNC(func) ((void) &func) # elif (ACC_CC_MSC && (_MSC_VER < 900)) # define ACC_UNUSED_FUNC(func) if (func) ; else -# elif (ACC_CC_MSC && (_MSC_VER >= 1200)) -# define ACC_UNUSED_FUNC(func) ((void) (void (*)(void)) func) +# elif (ACC_CC_MSC) +# define ACC_UNUSED_FUNC(func) ((void) &func) # elif (ACC_CC_KEILC) # define ACC_UNUSED_FUNC(func) # else diff --git a/src/acc/acclib/uclock.ch b/src/acc/acclib/uclock.ch index 2e6fcd1a..d20dc9c6 100644 --- a/src/acc/acclib/uclock.ch +++ b/src/acc/acclib/uclock.ch @@ -33,7 +33,7 @@ # define __ACCLIB_UCLOCK_USE_CLOCK 1 # else # define __ACCLIB_UCLOCK_USE_WINMM 1 -# if (ACC_CC_MSC && (_MSC_VER >= 1000)) +# if (ACC_CC_MSC && (_MSC_VER >= 900)) /* avoid `-W4' warnings in */ # pragma warning(disable: 4201) # elif (ACC_CC_MWERKS)