[freetype2] master 57f73d1: Synchronize with gnulib (#49448).

[Werner LEMBERG]

branch: master
commit 57f73d1f77b058ecd9ccac922c311cd9e37ce26e
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    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.
---
 ChangeLog                          |   10 ++++++++++
 builds/unix/ftconfig.in            |    8 ++++----
 builds/vms/ftconfig.h              |   16 ++++++++++++----
 include/freetype/config/ftconfig.h |   16 ++++++++++++----
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0dc5880..881d23e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-10-29  Werner Lemberg  <address@hidden>
+
+       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.
+
 2016-11-03  Behdad Esfahbod  <address@hidden>
 
        [truetype] Clamp variation requests to valid range.
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index fbb1c14..7eb5106 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 fb75e40..9c7e4ec 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
diff --git a/include/freetype/config/ftconfig.h 
b/include/freetype/config/ftconfig.h
index 157a704..7c21d66 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -143,6 +143,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>                                                             */
@@ -338,10 +346,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