Commit a32682f17668490c0bbde06a120a47372eb9dea2
2013-08-06T00:21:46
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/ChangeLog b/ChangeLog
index d264471..3cfbcb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2013-08-05 Werner Lemberg <wl@gnu.org>
+ 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 <wl@gnu.org>
+
Fix gcc pragmas.
* src/truetype/ttinterp.c (TT_MulFix14_long_long,
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index aefeaa2..14854d9 100644
--- 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__) */