shithub: freetype+ttf2subf

Download patch

ref: a32682f17668490c0bbde06a120a47372eb9dea2
parent: 69e524d5fe2a43c22764f2ecdb04a84578417924
author: Werner Lemberg <[email protected]>
date: Mon Aug 5 20:21:46 EDT 2013 

Fix gcc pragmas, part 2.

* src/truetype/ttinterp.c (TT_MulFix14_long_long,
TT_DotFix14_long_long): `#pragma gcc diagnostic {push,pop}' has been
introduced with gcc version 4.6.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2013-08-05  Werner Lemberg  <[email protected]>
 
+	Fix gcc pragmas, part 2.
+
+	* src/truetype/ttinterp.c (TT_MulFix14_long_long,
+	TT_DotFix14_long_long): `#pragma gcc diagnostic {push,pop}' has been
+	introduced with gcc version 4.6.
+
+2013-08-05  Werner Lemberg  <[email protected]>
+
 	Fix gcc pragmas.
 
 	* src/truetype/ttinterp.c (TT_MulFix14_long_long,
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -1495,7 +1495,9 @@
 #define TT_MulFix14  TT_MulFix14_long_long
 
   /* Temporarily disable the warning that C90 doesn't support `long long'. */
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
 #pragma GCC diagnostic push
+#endif
 #pragma GCC diagnostic ignored "-Wlong-long"
 
   /* This is declared `noinline' because inlining the function results */
@@ -1520,7 +1522,9 @@
     return (FT_Int32)( ret >> 14 );
   }
 
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
 #pragma GCC diagnostic pop
+#endif
 
 #endif /* __GNUC__ && ( __i386__ || __x86_64__ ) */
 
@@ -1571,7 +1575,9 @@
 
 #define TT_DotFix14  TT_DotFix14_long_long
 
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
 #pragma GCC diagnostic push
+#endif
 #pragma GCC diagnostic ignored "-Wlong-long"
 
   static __attribute__(( pure )) FT_Int32
@@ -1595,7 +1601,9 @@
 
   }
 
+#if ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 406
 #pragma GCC diagnostic pop
+#endif
 
 #endif /* __GNUC__ && (__arm__ || __i386__ || __x86_64__) */