diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-03-27 19:02:02 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-03-27 19:02:02 +0000 |
| commit | 4000100e143e364be9f292c38fa1158e3a516c55 (patch) | |
| tree | 9d95a28b1c7f6f577bd5461f8092e5adae460c1f /src/include/cvc4_public.h | |
| parent | 390477967f6179b03754c27be027b22ea77052bc (diff) | |
fixes to attribute-internals warnings on 64-bit; also some GCC function attribute cleanup; nothing major
Diffstat (limited to 'src/include/cvc4_public.h')
| -rw-r--r-- | src/include/cvc4_public.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/include/cvc4_public.h b/src/include/cvc4_public.h index a2db90457..c9aba5952 100644 --- a/src/include/cvc4_public.h +++ b/src/include/cvc4_public.h @@ -26,20 +26,20 @@ #if defined _WIN32 || defined __CYGWIN__ # ifdef BUILDING_DLL # ifdef __GNUC__ -# define CVC4_PUBLIC __attribute__((dllexport)) +# define CVC4_PUBLIC __attribute__((__dllexport__)) # else /* ! __GNUC__ */ # define CVC4_PUBLIC __declspec(dllexport) # endif /* __GNUC__ */ # else /* BUILDING_DLL */ # ifdef __GNUC__ -# define CVC4_PUBLIC __attribute__((dllimport)) +# define CVC4_PUBLIC __attribute__((__dllimport__)) # else /* ! __GNUC__ */ # define CVC4_PUBLIC __declspec(dllimport) # endif /* __GNUC__ */ # endif /* BUILDING_DLL */ #else /* !( defined _WIN32 || defined __CYGWIN__ ) */ # if __GNUC__ >= 4 -# define CVC4_PUBLIC __attribute__ ((visibility("default"))) +# define CVC4_PUBLIC __attribute__ ((__visibility__("default"))) # else /* !( __GNUC__ >= 4 ) */ # define CVC4_PUBLIC # endif /* __GNUC__ >= 4 */ @@ -58,7 +58,7 @@ #ifdef __GNUC__ # if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 3 ) /* error function attribute only exists in GCC >= 4.3.0 */ -# define CVC4_UNDEFINED __attribute__((error("this function intentionally undefined"))) +# define CVC4_UNDEFINED __attribute__((__error__("this function intentionally undefined"))) # else /* GCC < 4.3.0 */ # define CVC4_UNDEFINED # endif /* GCC >= 4.3.0 */ @@ -67,13 +67,15 @@ #endif /* __GNUC__ */ #ifdef __GNUC__ -# define CVC4_UNUSED __attribute__((unused)) -# define CVC4_NORETURN __attribute__ ((noreturn)) -# define CVC4_CONST_FUNCTION __attribute__ ((const)) +# define CVC4_UNUSED __attribute__((__unused__)) +# define CVC4_NORETURN __attribute__ ((__noreturn__)) +# define CVC4_CONST_FUNCTION __attribute__ ((__const__)) +# define CVC4_PURE_FUNCTION __attribute__ ((__pure__)) #else /* ! __GNUC__ */ # define CVC4_UNUSED # define CVC4_NORETURN # define CVC4_CONST_FUNCTION +# define CVC4_PURE_FUNCTION #endif /* __GNUC__ */ #define EXPECT_TRUE(x) __builtin_expect( (x), true ) |