forked from minhngoc25a/freetype2
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.
This commit is contained in:
parent
2e209c6cbe
commit
603121c050
|
@ -1,3 +1,11 @@
|
||||||
|
2017-05-12 Hin-Tak Leung <htl10@users.sourceforge.net>
|
||||||
|
|
||||||
|
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 <sascha@google.com>
|
2017-05-11 Sascha Brawer <sascha@google.com>
|
||||||
Werner Lemberg <wl@gnu.org
|
Werner Lemberg <wl@gnu.org
|
||||||
|
|
||||||
|
|
|
@ -368,7 +368,7 @@ FT_BEGIN_HEADER
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
/* only 64bit Windows uses the LLP64 data model, i.e., */
|
/* only 64bit Windows uses the LLP64 data model, i.e., */
|
||||||
/* 32bit integers, 64bit pointers */
|
/* 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
|
#else
|
||||||
#define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
|
#define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -309,7 +309,7 @@ FT_BEGIN_HEADER
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
/* only 64bit Windows uses the LLP64 data model, i.e., */
|
/* only 64bit Windows uses the LLP64 data model, i.e., */
|
||||||
/* 32bit integers, 64bit pointers */
|
/* 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
|
#else
|
||||||
#define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
|
#define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -336,7 +336,7 @@ FT_BEGIN_HEADER
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
/* only 64bit Windows uses the LLP64 data model, i.e., */
|
/* only 64bit Windows uses the LLP64 data model, i.e., */
|
||||||
/* 32bit integers, 64bit pointers */
|
/* 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
|
#else
|
||||||
#define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
|
#define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue