Commit cbcf33d1d9dfd0db7a3cd013b5870da1366a65c6
2013-05-12T07:27:48
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
diff --git a/ChangeLog b/ChangeLog
index d7d4039..f3be77c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2013-05-12 Werner Lemberg <wl@gnu.org>
+ 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 <wl@gnu.org>
+
Fix Savannah bug #38968.
* include/freetype/ftmodapi.h: Add `FT_EXPORT' to
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index e0ad0ff..d171e24 100644
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -242,6 +242,18 @@ FT_BEGIN_HEADER
/* */
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 @@ FT_BEGIN_HEADER
#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
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index 5d96161..5dce30e 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -212,6 +212,18 @@ FT_BEGIN_HEADER
/* */
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_BEGIN_HEADER
/* 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 @@ FT_BEGIN_HEADER
/* 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 @@ FT_BEGIN_HEADER
#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 @@ FT_BEGIN_HEADER
#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