shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix `FT_UINT_TO_POINTER' macro for Windows.

* builds/unix/ftconfig.in, builds/vms/ftconfig.h,
include/freetype/config/ftconfig.h (FT_UINT_TO_POINTER) [_WIN64]:
Fix definition.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2017-05-12  Hin-Tak Leung  <[email protected]>

+

+	Fix `FT_UINT_TO_POINTER' macro for Windows.

+

+	* builds/unix/ftconfig.in, builds/vms/ftconfig.h,

+	include/freetype/config/ftconfig.h (FT_UINT_TO_POINTER) [_WIN64]:

+	Fix definition.

+

 2017-05-11  Sascha Brawer  <[email protected]>

 	    Werner Lemberg  <[email protected]

--- a/builds/unix/ftconfig.in

+++ b/builds/unix/ftconfig.in

@@ -368,7 +368,7 @@

 #ifdef _WIN64

   /* only 64bit Windows uses the LLP64 data model, i.e., */

   /* 32bit integers, 64bit pointers                      */

-#define FT_UINT_TO_POINTER( x ) (void*)(FT_UInt64)(x)

+#define FT_UINT_TO_POINTER( x ) (void*)(unsigned __int64)(x)

 #else

 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)

 #endif

--- a/builds/vms/ftconfig.h

+++ b/builds/vms/ftconfig.h

@@ -309,7 +309,7 @@

 #ifdef _WIN64

   /* only 64bit Windows uses the LLP64 data model, i.e., */

   /* 32bit integers, 64bit pointers                      */

-#define FT_UINT_TO_POINTER( x ) (void*)(FT_UInt64)(x)

+#define FT_UINT_TO_POINTER( x ) (void*)(unsigned __int64)(x)

 #else

 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)

 #endif

--- a/include/freetype/config/ftconfig.h

+++ b/include/freetype/config/ftconfig.h

@@ -336,7 +336,7 @@

 #ifdef _WIN64

   /* only 64bit Windows uses the LLP64 data model, i.e., */

   /* 32bit integers, 64bit pointers                      */

-#define FT_UINT_TO_POINTER( x ) (void*)(FT_UInt64)(x)

+#define FT_UINT_TO_POINTER( x ) (void*)(unsigned __int64)(x)

 #else

 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)

 #endif