diff options
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/Makefile.am | 11 | ||||
| -rw-r--r-- | fontconfig/src/fcint.h | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/fontconfig/src/Makefile.am b/fontconfig/src/Makefile.am index 3dd69dde9..dc082b7df 100644 --- a/fontconfig/src/Makefile.am +++ b/fontconfig/src/Makefile.am @@ -80,14 +80,15 @@ INCLUDES = \ EXTRA_DIST = makealias -noinst_HEADERS=fcint.h fcftint.h fcdeprecate.h +noinst_HEADERS=fcint.h fcftint.h fcdeprecate.h fcstdint.h ALIAS_FILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h BUILT_SOURCES = $(ALIAS_FILES) \ ../fc-case/fccase.h \ ../fc-glyphname/fcglyphname.h \ - ../fc-lang/fclang.h + ../fc-lang/fclang.h \ + stamp-fcstdint noinst_PROGRAMS = fcarch @@ -158,7 +159,13 @@ fcftaliastail.h: fcftalias.h fcftalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FT_FILES) $(AM_V_GEN) sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" fcftalias.h fcftaliastail.h $(PUBLIC_FT_FILES) +stamp-fcstdint: $(top_builddir)/config.status + $(AM_V_GEN) cd $(top_builddir) && \ + $(SHELL) ./config.status src/fcstdint.h + @touch $@ + CLEANFILES = $(ALIAS_FILES) +DISTCLEANFILES = stamp-fcstdint fcstdint.h fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES) echo Generating $@ diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index e9f315f6b..7125f2e5e 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -29,15 +29,10 @@ #include <config.h> #endif +#include "fcstdint.h" + #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_INTTYPES_H -#include <inttypes.h> -#elif defined(HAVE_STDINT_H) -#include <stdint.h> -#else -#error missing C99 integer data types -#endif #include <string.h> #include <ctype.h> #include <errno.h> |