diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-12-22 10:43:46 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-12-22 10:43:46 +0100 |
| commit | 06d61b487a273a2bcd8a15c94799bcf2743a7cd3 (patch) | |
| tree | 756d45e8eca182ce2133a07df33590ec2c13b835 /builds | |
| parent | 7f7333990ce65b0251535fe181ef1fce30219bb1 (diff) | |
| download | freetype2-06d61b487a273a2bcd8a15c94799bcf2743a7cd3.tar.gz | |
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.
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/unix/ftconfig.in | 7 | ||||
| -rw-r--r-- | builds/vms/ftconfig.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index 6f228f51f..6401f657c 100644 --- 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 */ diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h index 9c7e4eca9..eb7fced3a 100644 --- 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 */ |