From: Keith Packard Date: Tue, 18 Nov 2003 07:53:04 +0000 (+0000) Subject: Switch to FreeType 2.1.7 style includes. Bug #150. X-Git-Tag: fc-2_2_93~11 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=408dd9c07a9b0b755f9338b4cbff9e4292fa391d;p=fontconfig.git Switch to FreeType 2.1.7 style includes. Bug #150. reviewed by: Keith Packard --- diff --git a/ChangeLog b/ChangeLog index f4dea62..545f758 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-11-17 Eric Christopherson + + reviewed by: Keith Packard + + * doc/Makefile.am: + * fontconfig/fcfreetype.h: + * src/fcfreetype.c: + Switch to FreeType 2.1.7 style includes. Bug #150. + 2003-11-16 Noah Levitt * fc-list/fc-list.sgml: Add some example usages. diff --git a/doc/Makefile.am b/doc/Makefile.am index 793ae4f..9e9cbeb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -134,6 +134,7 @@ fontconfig-user.html: local-fontconfig-user.sgml version.sgml confdir.sgml $(DOC2HTML) -u local-fontconfig-user.sgml > $@.tmp -test -f local-$@ && mv local-$@ $@ -test -f $@ || mv $@.tmp $@ + -test -f $@.tmp && $(RM) $@.tmp fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml $(RM) $@ diff --git a/fontconfig/fcfreetype.h b/fontconfig/fcfreetype.h index 479096f..20241dc 100644 --- a/fontconfig/fcfreetype.h +++ b/fontconfig/fcfreetype.h @@ -24,7 +24,8 @@ #ifndef _FCFREETYPE_H_ #define _FCFREETYPE_H_ -#include +#include +#include FT_FREETYPE_H _FCFUNCPROTOBEGIN diff --git a/src/fcfreetype.c b/src/fcfreetype.c index 054e208..4feb37d 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -48,16 +48,17 @@ #include #include #include "fcint.h" -#include -#include -#include -#include -#include -#include +#include +#include FT_FREETYPE_H +#include FT_INTERNAL_OBJECTS_H +#include FT_TRUETYPE_TABLES_H +#include FT_SFNT_NAMES_H +#include FT_TRUETYPE_IDS_H +#include FT_TYPE1_TABLES_H #if HAVE_FT_GET_BDF_PROPERTY -#include -#include +#include FT_BDF_H +#include FT_MODULE_H #define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \ (f)->driver->root.clazz->get_interface) #define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \