6409196 freetype2 ftconfig.h defines SIZEOF_LONG to be 8 on 32bit x86
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Thu, 02 Nov 2006 17:06:53 -0800
changeset 79 d7531359b0b5
parent 78 f8aa092f8dea
child 80 59eb925d41b1
6409196 freetype2 ftconfig.h defines SIZEOF_LONG to be 8 on 32bit x86
open-src/lib/freetype/freetype-2.1.10.patch
--- a/open-src/lib/freetype/freetype-2.1.10.patch	Thu Oct 26 15:23:05 2006 -0700
+++ b/open-src/lib/freetype/freetype-2.1.10.patch	Thu Nov 02 17:06:53 2006 -0800
@@ -113,3 +113,41 @@
          ;
        }
 
+--- include/freetype/config/ftconfig.h.orig	Thu Sep 14 15:49:27 2006
++++ include/freetype/config/ftconfig.h	Thu Sep 14 15:50:32 2006
+@@ -72,6 +72,7 @@
+ 
+ 
+   /* The size of an `int' type.  */
++#ifdef _LP64
+ #if                                 FT_UINT_MAX == 0xFFFFUL
+ #define FT_SIZEOF_INT  (16 / FT_CHAR_BIT)
+ #elif                               FT_UINT_MAX == 0xFFFFFFFFUL
+@@ -81,9 +82,17 @@
+ #else
+ #error "Unsupported size of `int' type!"
+ #endif
++#else
++#if                                 FT_UINT_MAX == 0xFFFFUL
++#define FT_SIZEOF_INT  (16 / FT_CHAR_BIT)
++#else
++#define FT_SIZEOF_INT  (32 / FT_CHAR_BIT)
++#endif
++#endif
+ 
+   /* The size of a `long' type.  A five-byte `long' (as used e.g. on the */
+   /* DM642) is recognized but avoided.                                   */
++#ifdef _LP64
+ #if                                  FT_ULONG_MAX == 0xFFFFFFFFUL
+ #define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
+ #elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
+@@ -93,6 +102,9 @@
+ #else
+ #error "Unsupported size of `long' type!"
+ #endif
++#else
++#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
++#endif
+ 
+ 
+   /* Preferred alignment of data */