[freetype2] master 3f9b78fc7 2/2: [zlib] Don't typedef `ptrdiff_t`.

[Werner Lemberg]

branch: master
commit 3f9b78fc7991f053d7d38a8b702456e2e3eed282
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    [zlib] Don't typedef `ptrdiff_t`.
    
    While using zlib in 'solo' mode (via the `Z_SOLO` macro), we actually
    include some standard header files, making the typedef fail on systems where
    the native `ptrdiff_t` type differs.
    
    Fixes #1124.
    
    * src/zlib/zutil.h: Comment out definition; it doesn't work on Windows.
    
    * src/zlib/patches/freetype-zlib.diff: Updated.
---
 src/gzip/patches/freetype-zlib.diff | 18 ++++++++++++++----
 src/gzip/zutil.h                    |  2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/gzip/patches/freetype-zlib.diff 
b/src/gzip/patches/freetype-zlib.diff
index 43fb5d661..90dd6c863 100644
--- a/src/gzip/patches/freetype-zlib.diff
+++ b/src/gzip/patches/freetype-zlib.diff
@@ -350,10 +350,20 @@ index f09cdaf1e..1807c0645 100644
  #ifdef __cplusplus
  }
 diff --git b/src/gzip/zutil.h a/src/gzip/zutil.h
-index b079ea6a8..a38573878 100644
+index b079ea6a8..2d734a835 100644
 --- b/src/gzip/zutil.h
 +++ a/src/gzip/zutil.h
-@@ -185,6 +185,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 
2-zlib_error */
+@@ -30,7 +30,9 @@
+ #endif
+ 
+ #ifdef Z_SOLO
++#  ifndef Z_FREETYPE
+    typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
++#  endif
+ #endif
+ 
+ #ifndef local
+@@ -185,6 +187,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 
2-zlib_error */
    #pragma warn -8066
  #endif
  
@@ -362,7 +372,7 @@ index b079ea6a8..a38573878 100644
  /* provide prototypes for these when building zlib without LFS */
  #if !defined(_WIN32) && \
      (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-@@ -192,6 +194,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 
2-zlib_error */
+@@ -192,6 +196,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 
2-zlib_error */
      ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
  #endif
  
@@ -371,7 +381,7 @@ index b079ea6a8..a38573878 100644
          /* common defaults */
  
  #ifndef OS_CODE
-@@ -223,9 +227,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 
2-zlib_error */
+@@ -223,9 +229,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 
2-zlib_error */
  #    define zmemcmp _fmemcmp
  #    define zmemzero(dest, len) _fmemset(dest, 0, len)
  #  else
diff --git a/src/gzip/zutil.h b/src/gzip/zutil.h
index a38573878..2d734a835 100644
--- a/src/gzip/zutil.h
+++ b/src/gzip/zutil.h
@@ -30,7 +30,9 @@
 #endif
 
 #ifdef Z_SOLO
+#  ifndef Z_FREETYPE
    typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
+#  endif
 #endif
 
 #ifndef local