From: Patrick Lam <plam@MIT.EDU>
Date: Fri, 7 Apr 2006 17:06:55 +0000 (+0000)
Subject: Move up #include of config.h. Fail if neither inttypes.h nor stdint.h is
X-Git-Tag: fc-2_3_95~27
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=91fe51b4f8cf792041bc5cad34797b87abd63e67;p=fontconfig.git

Move up #include of config.h. Fail if neither inttypes.h nor stdint.h is
    available. Fixes bug 6171.
reviewed by: plam
---

diff --git a/ChangeLog b/ChangeLog
index 1b1fc46..d2e879d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-07  Dominic Lachowicz  <cinamod@hotmail.com>
+	reviewed by: plam
+	* src/fcint.h:
+
+	Move up #include of config.h.
+	Fail if neither inttypes.h nor stdint.h is available.
+	Fixes bug 6171.
+
 2006-04-07  Dominic Lachowicz  <cinamod@hotmail.com>
 	    Patrick Lam  <plam@mit.edu>
 	* configure.in:
diff --git a/src/fcint.h b/src/fcint.h
index 84df88d..0a036b4 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -25,12 +25,18 @@
 #ifndef _FCINT_H_
 #define _FCINT_H_
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
-#else
+#elif defined(HAVE_STDINT_H)
 #include <stdint.h>
+#else
+#error missing C99 integer data types
 #endif
 #include <string.h>
 #include <ctype.h>
@@ -42,9 +48,6 @@
 #include <fontconfig/fontconfig.h>
 #include <fontconfig/fcprivate.h>
 #include <fontconfig/fcfreetype.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #ifndef FC_CONFIG_PATH
 #define FC_CONFIG_PATH "fonts.conf"