Revert some changes from newer versions and move to stable.

include/freetype/ftimage.h

@@ -27,6 +27,7 @@
 #ifndef FTIMAGE_H_
 #define FTIMAGE_H_
 
+#include <stdint.h>
 
 FT_BEGIN_HEADER
 
@@ -49,7 +50,7 @@ FT_BEGIN_HEADER
    *   the context, these can represent distances in integer font units, or
    *   16.16, or 26.6 fixed-point pixel coordinates.
    */
-  typedef signed long  FT_Pos;
+  typedef int64_t FT_Pos;
 
 
   /**************************************************************************

include/freetype/fttypes.h

@@ -26,6 +26,7 @@
 #include <freetype/ftimage.h>
 
 #include <stddef.h>
+#include <stdint.h>
 
 
 FT_BEGIN_HEADER
@@ -242,7 +243,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A typedef for signed long.
    */
-  typedef signed long  FT_Long;
+  typedef int64_t FT_Long;
 
 
   /**************************************************************************
@@ -253,7 +254,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A typedef for unsigned long.
    */
-  typedef unsigned long  FT_ULong;
+  typedef uint64_t FT_ULong;
 
 
   /**************************************************************************
@@ -264,7 +265,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A signed 2.14 fixed-point type used for unit vectors.
    */
-  typedef signed short  FT_F2Dot14;
+  typedef int16_t FT_F2Dot14;
 
 
   /**************************************************************************
@@ -275,7 +276,7 @@ FT_BEGIN_HEADER
    * @description:
    *   A signed 26.6 fixed-point type used for vectorial pixel coordinates.
    */
-  typedef signed long  FT_F26Dot6;
+  typedef int32_t FT_F26Dot6;
 
 
   /**************************************************************************
@@ -287,7 +288,7 @@ FT_BEGIN_HEADER
    *   This type is used to store 16.16 fixed-point values, like scaling
    *   values or matrix coefficients.
    */
-  typedef signed long  FT_Fixed;
+  typedef int32_t FT_Fixed;
 
 
   /**************************************************************************