shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix conditional usage of FT_MulFix_i386.
With -ansi flag, gcc does not define `i386', only `__i386__'.

* include/freetype/config/ftconfig.h, builds/unix/ftconfig.in:
s/i386/__i386__/.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2010-08-06  Yuriy Kaminskiy  <[email protected]>

+

+	Fix conditional usage of FT_MulFix_i386.

+	With -ansi flag, gcc does not define `i386', only `__i386__'.

+

+	* include/freetype/config/ftconfig.h, builds/unix/ftconfig.in:

+	s/i386/__i386__/.

+

 2010-08-05  Werner Lemberg  <[email protected]>

 	Fix Savannah bug #30657.

--- a/builds/unix/ftconfig.in

+++ b/builds/unix/ftconfig.in

@@ -313,7 +313,7 @@

 #endif /* __arm__ && !__thumb__ */

-#if defined( i386 )

+#if defined( __i386__ )

 #define FT_MULFIX_ASSEMBLER  FT_MulFix_i386

   static __inline__ FT_Int32

--- a/include/freetype/config/ftconfig.h

+++ b/include/freetype/config/ftconfig.h

@@ -363,7 +363,7 @@

 #endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */

-#if defined( i386 )

+#if defined( __i386__ )

 #define FT_MULFIX_ASSEMBLER  FT_MulFix_i386

   /* documentation is in freetype.h */