Ensure used preprocessor symbols are defined (#49790).

* builds/unix/ftconfig.in, builds/vms/ftconfig.h, include/freetype/config/ftconfig.h: Check `__GNUC__', `__IBMC__', and `__SUNPRO_C' correctly.
8 years ago · 06d61b487a
parent 7f7333990c
commit 06d61b487a
4 changed files with 20 additions and 9 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2016-12-22  Werner Lemberg  <wl@gnu.org>
+
+	Ensure used preprocessor symbols are defined (#49790).
+
+	* builds/unix/ftconfig.in, builds/vms/ftconfig.h,
+	include/freetype/config/ftconfig.h: Check `__GNUC__', `__IBMC__',
+	and `__SUNPRO_C' correctly.
+
 2016-12-22  Werner Lemberg  <wl@gnu.org>

 	* src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): Check `count'.
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@ -378,9 +378,10 @@ FT_BEGIN_HEADER


  /* typeof condition taken from gnulib's `intprops.h' header file */
-#if ( __GNUC__ >= 2                                      || \
-      ( __IBMC__ >= 1210 && defined( __IBM__TYPEOF__ ) ) || \
-      ( __SUNPRO_C >= 0x5110 && !__STDC__ )              )
+#if ( ( defined( __GNUC__ ) && __GNUC__ >= 2 )                       || \
+      ( defined( __IBMC__ ) && __IBMC__ >= 1210 &&                      \
+        defined( __IBM__TYPEOF__ ) )                                 || \
+      ( defined( __SUNPRO_C ) && __SUNPRO_C >= 0x5110 && !__STDC__ ) )
 #define FT_TYPEOF( type )  ( __typeof__ ( type ) )
 #else
 #define FT_TYPEOF( type )  /* empty */
--- a/builds/vms/ftconfig.h
+++ b/builds/vms/ftconfig.h
@ -319,9 +319,10 @@ FT_BEGIN_HEADER


  /* typeof condition taken from gnulib's `intprops.h' header file */
-#if ( __GNUC__ >= 2                                      || \
-      ( __IBMC__ >= 1210 && defined( __IBM__TYPEOF__ ) ) || \
-      ( __SUNPRO_C >= 0x5110 && !__STDC__ )              )
+#if ( ( defined( __GNUC__ ) && __GNUC__ >= 2 )                       || \
+      ( defined( __IBMC__ ) && __IBMC__ >= 1210 &&                      \
+        defined( __IBM__TYPEOF__ ) )                                 || \
+      ( defined( __SUNPRO_C ) && __SUNPRO_C >= 0x5110 && !__STDC__ ) )
 #define FT_TYPEOF( type )  ( __typeof__ ( type ) )
 #else
 #define FT_TYPEOF( type )  /* empty */
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@ -346,9 +346,10 @@ FT_BEGIN_HEADER


  /* typeof condition taken from gnulib's `intprops.h' header file */
-#if ( __GNUC__ >= 2                                      || \
-      ( __IBMC__ >= 1210 && defined( __IBM__TYPEOF__ ) ) || \
-      ( __SUNPRO_C >= 0x5110 && !__STDC__ )              )
+#if ( ( defined( __GNUC__ ) && __GNUC__ >= 2 )                       || \
+      ( defined( __IBMC__ ) && __IBMC__ >= 1210 &&                      \
+        defined( __IBM__TYPEOF__ ) )                                 || \
+      ( defined( __SUNPRO_C ) && __SUNPRO_C >= 0x5110 && !__STDC__ ) )
 #define FT_TYPEOF( type )  ( __typeof__ ( type ) )
 #else
 #define FT_TYPEOF( type )  /* empty */