Skip to content

Commit b1114a8

Browse files
Aurelien Serandourxen2
Aurelien Serandour
authored andcommitted
Windows 64-bit patch: change long to __int64 when necessary
1 parent 90cc305 commit b1114a8

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

include/ftimage.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ FT_BEGIN_HEADER
5555
/* on the context, these can represent distances in integer font */
5656
/* units, or 16.16, or 26.6 fixed-point pixel coordinates. */
5757
/* */
58-
typedef signed long FT_Pos;
58+
#ifdef _WIN64
59+
typedef signed __int64 FT_Pos;
60+
#else
61+
typedef signed long FT_Pos;
62+
#endif
5963

6064

6165
/*************************************************************************/

include/fttypes.h

+20-4
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ FT_BEGIN_HEADER
235235
/* <Description> */
236236
/* A typedef for signed long. */
237237
/* */
238-
typedef signed long FT_Long;
238+
#ifdef _WIN64
239+
typedef signed __int64 FT_Long;
240+
#else
241+
typedef signed long FT_Long;
242+
#endif
239243

240244

241245
/*************************************************************************/
@@ -246,7 +250,11 @@ FT_BEGIN_HEADER
246250
/* <Description> */
247251
/* A typedef for unsigned long. */
248252
/* */
249-
typedef unsigned long FT_ULong;
253+
#ifdef _WIN64
254+
typedef unsigned __int64 FT_ULong;
255+
#else
256+
typedef unsigned long FT_ULong;
257+
#endif
250258

251259

252260
/*************************************************************************/
@@ -269,7 +277,11 @@ FT_BEGIN_HEADER
269277
/* A signed 26.6 fixed-point type used for vectorial pixel */
270278
/* coordinates. */
271279
/* */
272-
typedef signed long FT_F26Dot6;
280+
#ifdef _WIN64
281+
typedef signed __int64 FT_F26Dot6;
282+
#else
283+
typedef signed long FT_F26Dot6;
284+
#endif
273285

274286

275287
/*************************************************************************/
@@ -281,7 +293,11 @@ FT_BEGIN_HEADER
281293
/* This type is used to store 16.16 fixed-point values, like scaling */
282294
/* values or matrix coefficients. */
283295
/* */
284-
typedef signed long FT_Fixed;
296+
#ifdef _WIN64
297+
typedef signed __int64 FT_Fixed;
298+
#else
299+
typedef signed long FT_Fixed;
300+
#endif
285301

286302

287303
/*************************************************************************/

0 commit comments

Comments
 (0)