diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-11-06 06:06:30 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-11-06 06:06:30 +0100 |
| commit | 57f73d1f77b058ecd9ccac922c311cd9e37ce26e (patch) | |
| tree | d00c376f807283f21c9c44c6d42d731054ef2892 /builds | |
| parent | b72858c992d4c9b06899f35f8e11c71801229c53 (diff) | |
| download | freetype2-57f73d1f77b058ecd9ccac922c311cd9e37ce26e.tar.gz | |
Synchronize with gnulib (#49448).
* include/freetype/config/ftconfig.h, builds/unix/ftconfig.in,
builds/vms/ftconfig.h (FT_TYPEOF): Update code to use definition in
current version of `intprops.h'.
Other minor synchronization to reduce code differences between the
three files.
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/unix/ftconfig.in | 8 | ||||
| -rw-r--r-- | builds/vms/ftconfig.h | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index fbb1c1474..7eb5106ae 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -368,10 +368,10 @@ FT_BEGIN_HEADER /* typeof condition taken from gnulib's `intprops.h' header file */ -#if ( __GNUC__ >= 2 || \ - defined( __IBM__TYPEOF__ ) || \ - ( __SUNPRO_C >= 0x5110 && !__STDC__ ) ) -#define FT_TYPEOF( type ) (__typeof__ (type)) +#if ( __GNUC__ >= 2 || \ + ( __IBMC__ >= 1210 && defined( __IBM__TYPEOF__ ) ) || \ + ( __SUNPRO_C >= 0x5110 && !__STDC__ ) ) +#define FT_TYPEOF( type ) ( __typeof__ ( type ) ) #else #define FT_TYPEOF( type ) /* empty */ #endif diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h index fb75e4064..9c7e4eca9 100644 --- a/builds/vms/ftconfig.h +++ b/builds/vms/ftconfig.h @@ -116,6 +116,14 @@ FT_BEGIN_HEADER #endif + /* Fix compiler warning with sgi compiler */ +#if defined( __sgi ) && !defined( __GNUC__ ) +#if defined( _COMPILER_VERSION ) && ( _COMPILER_VERSION >= 730 ) +#pragma set woff 3505 +#endif +#endif + + /*************************************************************************/ /* */ /* <Section> */ @@ -311,10 +319,10 @@ FT_BEGIN_HEADER /* typeof condition taken from gnulib's `intprops.h' header file */ -#if ( __GNUC__ >= 2 || \ - defined( __IBM__TYPEOF__ ) || \ - ( __SUNPRO_C >= 0x5110 && !__STDC__ ) ) -#define FT_TYPEOF( type ) (__typeof__ (type)) +#if ( __GNUC__ >= 2 || \ + ( __IBMC__ >= 1210 && defined( __IBM__TYPEOF__ ) ) || \ + ( __SUNPRO_C >= 0x5110 && !__STDC__ ) ) +#define FT_TYPEOF( type ) ( __typeof__ ( type ) ) #else #define FT_TYPEOF( type ) /* empty */ #endif |