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 1b1fc469549629fbd83cc2adae50a4dd4a0bd8e4..d2e879df0abc61b9198ad1fb021dad2def78c54a 100644 (file)
--- 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 84df88de225986bb96803ffc527b63e6dd0b13a3..0a036b4f864a9f52fd3abb3d9966ba1605e26d08 100644 (file)
--- 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"