From a24f4637eac7cd6b83f6238ea288139fee554bc4 Mon Sep 17 00:00:00 2001 From: Neil Jerram Date: Thu, 5 Feb 2009 22:03:53 +0000 Subject: [PATCH] Fix build when compiled with -Wundef -Werror (Reported by David Fang) * libguile/inline.h: Check if __APPLE_CC__ is defined before testing its value. --- NEWS | 1 + THANKS | 1 + libguile/inline.h | 2 +- 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 1fe8b91..71e9dc0 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ Changes in 1.8.7 (since 1.8.6) ** Fix %fast-slot-ref/set!, to avoid possible segmentation fault ** Fix MinGW build problem caused by HAVE_STRUCT_TIMESPEC confusion ** Fix build problem when scm_t_timespec is different from struct timespec +** Fix build when compiled with -Wundef -Werror Changes in 1.8.6 (since 1.8.5) diff --git a/THANKS b/THANKS index c5d7d0a..feafc12 100644 --- a/THANKS +++ b/THANKS @@ -36,6 +36,7 @@ For fixes or providing information which led to a fix: Nils Durner John W Eaton Clinton Ebadi + David Fang Charles Gagnon Peter Gavin Eric Gillespie, Jr diff --git a/libguile/inline.h b/libguile/inline.h index 8fa9a8c..eae1e22 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 \ -- 1.5.6.5