Commit 41f9d0d6eebc698a83394f1d97cfb206484ac740

suzuki toshiya 2009-08-01T00:30:18

fttypes.h: Cast FT_MAKE_TAG output to FT_Tag exlicitly.

diff --git a/ChangeLog b/ChangeLog
index ce3b924..23da6e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-07-31  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 
+	fttypes.h: Cast FT_MAKE_TAG output to FT_Tag exlicitly.
+
+	* include/freetype/fttypes.h (FT_MAKE_TAG):
+	Cast the result to FT_Tag.
+
+2009-07-31  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
 	psnames: Handle Unicode codepoints by FT_UInt32 variables.
 
 	* src/psnames/psmodule.c (BASE_GLYPH): Cast the result
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index d7bf92a..a57ffa6 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -474,6 +474,7 @@ FT_BEGIN_HEADER
   /*    this macro.                                                        */
   /*                                                                       */
 #define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
+          (FT_Tag)                        \
           ( ( (FT_ULong)_x1 << 24 ) |     \
             ( (FT_ULong)_x2 << 16 ) |     \
             ( (FT_ULong)_x3 <<  8 ) |     \