From 91fe51b4f8cf792041bc5cad34797b87abd63e67 Mon Sep 17 00:00:00 2001 From: Patrick Lam Date: Fri, 7 Apr 2006 17:06:55 +0000 Subject: [PATCH] Move up #include of config.h. Fail if neither inttypes.h nor stdint.h is available. Fixes bug 6171. reviewed by: plam --- ChangeLog | 8 ++++++++ src/fcint.h | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b1fc46..d2e879d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-04-07 Dominic Lachowicz + 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 Patrick Lam * 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 +#endif + #include #include #ifdef HAVE_INTTYPES_H #include -#else +#elif defined(HAVE_STDINT_H) #include +#else +#error missing C99 integer data types #endif #include #include @@ -42,9 +48,6 @@ #include #include #include -#ifdef HAVE_CONFIG_H -#include -#endif #ifndef FC_CONFIG_PATH #define FC_CONFIG_PATH "fonts.conf" -- 2.39.5