diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-02-14 17:32:46 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-02-14 17:32:46 +0100 |
commit | f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a (patch) | |
tree | be17320f40e9cfd935238883dee59667cf4bf5bc /libguile/inline.h | |
parent | 63385df2fdc2f9bc70804383f071f2fb74743a86 (diff) | |
parent | fe11efeebaa2ebb7bf0fe8bc46a29c152ead2509 (diff) | |
download | guile-f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/gc-mark.c
libguile/procs.c
libguile/procs.h
libguile/threads.c
libguile/threads.h
Diffstat (limited to 'libguile/inline.h')
-rw-r--r-- | libguile/inline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/inline.h b/libguile/inline.h index 7d2dabaad..ff8d2d4d1 100644 --- a/libguile/inline.h +++ b/libguile/inline.h @@ -54,7 +54,7 @@ C99 mode and doesn't define `__GNUC_STDC_INLINE__'. Fall back to "static inline" in that case. */ -# if (defined __GNUC__) && (!(__APPLE_CC__ > 5400 && __STDC_VERSION__ >= 199901L)) +# if (defined __GNUC__) && (!(((defined __APPLE_CC__) && (__APPLE_CC__ > 5400)) && __STDC_VERSION__ >= 199901L)) # define SCM_C_USE_EXTERN_INLINE 1 # if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) # define SCM_C_EXTERN_INLINE \ |