diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| -rw-r--r-- | fontconfig/fcfreetype.h | 3 | ||||
| -rw-r--r-- | src/fcfreetype.c | 17 |
4 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2003-11-17 Eric Christopherson <rakko@charter.net> + + reviewed by: Keith Packard <keithp@keithp.com> + + * doc/Makefile.am: + * fontconfig/fcfreetype.h: + * src/fcfreetype.c: + Switch to FreeType 2.1.7 style includes. Bug #150. + 2003-11-16 Noah Levitt <nlevitt@columbia.edu> * 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 <freetype/freetype.h> +#include <ft2build.h> +#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 <stdio.h> #include <string.h> #include "fcint.h" -#include <freetype/freetype.h> -#include <freetype/internal/ftobjs.h> -#include <freetype/tttables.h> -#include <freetype/ftsnames.h> -#include <freetype/ttnameid.h> -#include <freetype/t1tables.h> +#include <ft2build.h> +#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 <freetype/ftbdf.h> -#include <freetype/ftmodule.h> +#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) ? \ |