[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ft-devel] [patch] fix ifdef for i386 and -ansi
From: |
Yuriy Kaminskiy |
Subject: |
[ft-devel] [patch] fix ifdef for i386 and -ansi |
Date: |
Fri, 06 Aug 2010 00:52:46 +0400 |
User-agent: |
Icedove 1.5.0.14eol (X11/20090105) |
With -ansi flag, gcc does not (auto)define i386, only __i386__ (so I think
assembler code was never used on i386/unix/gcc builds).
Patch applies to 2.4.1 too (with fuzzyness).
Maybe, it would be better just always use __i386__ (alternative patch).
--- freetype-2.3.10/include/freetype/config/ftconfig.h.orig 2009-03-14
16:45:26.000000000 +0300
+++ freetype-2.3.10/include/freetype/config/ftconfig.h 2009-10-09
22:04:07.765127442 +0400
@@ -335,7 +335,7 @@
#endif /* __arm__ && !__thumb__ */
-#if defined( i386 )
+#if defined( i386 ) || defined( __i386__ )
#define FT_MULFIX_ASSEMBLER FT_MulFix_i386
/* documentation is in freetype.h */
--- freetype-2.3.10/builds/unix/ftconfig.in.orig 2009-07-03
17:28:24.000000000 +0400
+++ freetype-2.3.10/builds/unix/ftconfig.in 2009-10-09 22:04:27.962720411
+0400
@@ -313,7 +313,7 @@
#endif /* __arm__ && !__thumb__ */
-#if defined( i386 )
+#if defined( i386 ) || defined( __i386__ )
#define FT_MULFIX_ASSEMBLER FT_MulFix_i386
static __inline__ FT_Int32
Index: freetype-2.4.1/include/freetype/config/ftconfig.h
===================================================================
--- freetype-2.4.1.orig/include/freetype/config/ftconfig.h 2010-08-05
22:39:32.000000000 +0400
+++ freetype-2.4.1/include/freetype/config/ftconfig.h 2010-08-06
00:16:46.000000000 +0400
@@ -363,7 +363,7 @@ FT_BEGIN_HEADER
#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */
-#if defined( i386 )
+#if defined( __i386__ )
#define FT_MULFIX_ASSEMBLER FT_MulFix_i386
/* documentation is in freetype.h */
Index: freetype-2.4.1/builds/unix/ftconfig.in
===================================================================
--- freetype-2.4.1.orig/builds/unix/ftconfig.in 2010-08-05 22:39:32.000000000
+0400
+++ freetype-2.4.1/builds/unix/ftconfig.in 2010-08-06 00:16:46.000000000
+0400
@@ -313,7 +313,7 @@ FT_BEGIN_HEADER
#endif /* __arm__ && !__thumb__ */
-#if defined( i386 )
+#if defined( __i386__ )
#define FT_MULFIX_ASSEMBLER FT_MulFix_i386
static __inline__ FT_Int32
- [ft-devel] [patch] fix ifdef for i386 and -ansi,
Yuriy Kaminskiy <=