diff options
-rw-r--r-- | libguile/__scm.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libguile/__scm.h b/libguile/__scm.h index 12d1e8afc..efdab6d67 100644 --- a/libguile/__scm.h +++ b/libguile/__scm.h @@ -62,6 +62,15 @@ * additional information to the developers. */ +/* Return true (non-zero) if GCC version MAJ.MIN or later is being used + * (macro taken from glibc.) */ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define SCM_GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +# define SCM_GNUC_PREREQ(maj, min) 0 +#endif + /* The macro SCM_NORETURN indicates that a function will never return. * Examples: * 1) int foo (char arg) SCM_NORETURN; @@ -89,7 +98,7 @@ /* The SCM_EXPECT macros provide branch prediction hints to the compiler. To * use only in places where the result of the expression under "normal" * circumstances is known. */ -#if defined(__GNUC__) && (__GNUC__ >= 3) +#if SCM_GNUC_PREREQ (3, 0) # define SCM_EXPECT __builtin_expect #else # define SCM_EXPECT(_expr, _value) (_expr) @@ -108,8 +117,7 @@ * or variables. Defining `SCM_BUILDING_DEPRECATED_CODE' allows deprecated * functions to be implemented in terms of deprecated functions, and allows * deprecated functions to be referred to by `scm_c_define_gsubr ()'. */ -#if !defined (SCM_BUILDING_DEPRECATED_CODE) \ - && defined (__GNUC__) && (__GNUC__ >= 3) +#if !defined (SCM_BUILDING_DEPRECATED_CODE) && SCM_GNUC_PREREQ (3, 0) # define SCM_DEPRECATED SCM_API __attribute__ ((__deprecated__)) #else # define SCM_DEPRECATED SCM_API @@ -129,7 +137,7 @@ /* The SCM_MALLOC macro can be used in function declarations to tell the * compiler that a function may be treated as if any non-NULL pointer it returns * cannot alias any other pointer valid when the function returns. */ -#if defined (__GNUC__) && (__GNUC__ >= 3) +#if SCM_GNUC_PREREQ (3, 0) # define SCM_MALLOC __attribute__ ((__malloc__)) #else # define SCM_MALLOC |