From: Keith Packard <keithp@neko.keithp.com>
Date: Fri, 1 Sep 2006 19:36:31 +0000 (-0700)
Subject: Avoid #warning directives on non-GCC compilers. (bug 7683)
X-Git-Tag: 2.3.96~18
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=5b8e43a48ea1a5fb4e54dd12fe965439df2bf95d;p=fontconfig.git

Avoid #warning directives on non-GCC compilers. (bug 7683)

Detect GCC and use #warning only on GCC systems.
---

diff --git a/configure.in b/configure.in
index 7875831..17a3c99 100644
--- a/configure.in
+++ b/configure.in
@@ -78,14 +78,16 @@ fi
 AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
 
 WARN_CFLAGS=""
-
 if test "x$GCC" = "xyes"; then
 	WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
 	-Wmissing-prototypes -Wmissing-declarations \
 	-Wnested-externs -fno-strict-aliasing"
+	AC_DEFINE_UNQUOTED(HAVE_WARNING_CPP_DIRECTIVE,1,
+	[Can use #warning in C files])
 fi
 AC_SUBST(WARN_CFLAGS)
 
+
 dnl ==========================================================================
 
 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 2cab48a..f85e2f8 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -64,6 +64,7 @@
 
 #include "ftglue.h"
 
+#if HAVE_WARNING_CPP_DIRECTIVE
 #if !HAVE_FT_GET_BDF_PROPERTY
 #warning "No FT_Get_BDF_Property: Please install freetype 2.1.4 or later"
 #endif
@@ -71,6 +72,7 @@
 #if !HAVE_FT_GET_PS_FONT_INFO
 #warning "No FT_Get_PS_Font_Info: Please install freetype 2.1.1 or later"
 #endif
+#endif
 
 /*
  * Keep Han languages separated by eliminating languages