diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-02-14 17:47:24 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-02-14 17:47:24 +0100 |
commit | bb2e15a5f4129d0ed9dedb2ac39f3205480c849e (patch) | |
tree | 3a1d0723d1d13dc562b1e09ad1a617ac00e2c4d4 /libguile/inline.h | |
parent | 4cc889000192b284913b92417afd0f39f7f6f134 (diff) | |
parent | f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a (diff) | |
download | guile-bb2e15a5f4129d0ed9dedb2ac39f3205480c849e.tar.gz |
Merge branch 'boehm-demers-weiser-gc' into bdw-gc-static-alloc
Conflicts:
.gitignore
libguile/procs.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 \ |