ref: cbcf33d1d9dfd0db7a3cd013b5870da1366a65c6
parent: d51ac9c7c6aa5773c806495052a7a862fce6a7e2
author: Werner Lemberg <[email protected]>
date: Sun May 12 03:27:48 EDT 2013
Introduce unsigned 64bit type (if available). * include/freetype/config/ftconfig.h: Define FT_UINT64 if available. [FT_LONG64]: Provide FT_UInt64. * builds/unix/ftconfig.in: Synchronized.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2013-05-12 Werner Lemberg <[email protected]>
+ Introduce unsigned 64bit type (if available).
+
+ * include/freetype/config/ftconfig.h: Define FT_UINT64 if available.
+ [FT_LONG64]: Provide FT_UInt64.
+
+ * builds/unix/ftconfig.in: Synchronized.
+
+2013-05-12 Werner Lemberg <[email protected]>
+
Fix Savannah bug #38968.
* include/freetype/ftmodapi.h: Add `FT_EXPORT' to
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -242,6 +242,18 @@
/* */
typedef signed XXX FT_Int64;
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_UInt64 */
+ /* */
+ /* A typedef for a 64bit unsigned integer type. The size depends on */
+ /* the configuration. Only defined if there is real 64bit support; */
+ /* otherwise, it gets emulated with a structure (if necessary). */
+ /* */
+ typedef unsigned XXX FT_UInt64;
+
/* */
#endif
@@ -339,7 +351,8 @@
#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
#ifdef FT_LONG64
- typedef FT_INT64 FT_Int64;
+ typedef FT_INT64 FT_Int64;
+ typedef FT_UINT64 FT_UInt64;
#endif
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -212,6 +212,18 @@
/* */
typedef signed XXX FT_Int64;
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_UInt64 */
+ /* */
+ /* A typedef for a 64bit unsigned integer type. The size depends on */
+ /* the configuration. Only defined if there is real 64bit support; */
+ /* otherwise, it gets emulated with a structure (if necessary). */
+ /* */
+ typedef unsigned XXX FT_UInt64;
+
/* */
#endif
@@ -251,13 +263,15 @@
/* FT_LONG64 must be defined if a 64-bit type is available */
#define FT_LONG64
-#define FT_INT64 long
+#define FT_INT64 long
+#define FT_UINT64 unsigned long
#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
/* this compiler provides the __int64 type */
#define FT_LONG64
-#define FT_INT64 __int64
+#define FT_INT64 __int64
+#define FT_UINT64 unsigned __int64
#elif defined( __BORLANDC__ ) /* Borland C++ */
@@ -266,7 +280,8 @@
/* this compiler provides the __int64 type */
#define FT_LONG64
-#define FT_INT64 __int64
+#define FT_INT64 __int64
+#define FT_UINT64 unsigned __int64
#elif defined( __WATCOMC__ ) /* Watcom C++ */
@@ -275,13 +290,15 @@
#elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */
#define FT_LONG64
-#define FT_INT64 long long int
+#define FT_INT64 long long int
+#define FT_UINT64 unsigned long long int
#elif defined( __GNUC__ )
/* GCC provides the `long long' type */
#define FT_LONG64
-#define FT_INT64 long long int
+#define FT_INT64 long long int
+#define FT_UINT64 unsigned long long int
#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
@@ -306,7 +323,8 @@
#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
#ifdef FT_LONG64
- typedef FT_INT64 FT_Int64;
+ typedef FT_INT64 FT_Int64;
+ typedef FT_UINT64 FT_UInt64;
#endif