Move up #include of config.h. Fail if neither inttypes.h nor stdint.h is

available. Fixes bug 6171.
reviewed by: plam
This commit is contained in:
Patrick Lam 2006-04-07 17:06:55 +00:00
parent d6217cc6bc
commit 91fe51b4f8
2 changed files with 15 additions and 4 deletions

View File

@ -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:

View File

@ -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"