diff options
| author | Patrick Lam <plam@MIT.EDU> | 2006-04-07 17:06:55 +0000 |
|---|---|---|
| committer | Patrick Lam <plam@MIT.EDU> | 2006-04-07 17:06:55 +0000 |
| commit | 91fe51b4f8cf792041bc5cad34797b87abd63e67 (patch) | |
| tree | 479c14701bd3836dac0a66b00deab162363dec59 | |
| parent | d6217cc6bcce0768ce1e01c077e90967ff91db5a (diff) | |
Move up #include of config.h. Fail if neither inttypes.h nor stdint.h is
available. Fixes bug 6171.
reviewed by: plam
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/fcint.h | 11 |
2 files changed, 15 insertions, 4 deletions
@@ -1,4 +1,12 @@ 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: * fc-cache/fc-cache.c: 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" |