rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Werner Lemberg 2016-12-22 10:43:46 +01:00
parent 7f7333990c
commit 06d61b487a
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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'.

7
builds/unix/ftconfig.in
View File

@ -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 */

7
builds/vms/ftconfig.h
View File

@ -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 */

7
include/freetype/config/ftconfig.h
View File

@ -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 */