]>
Commit | Line | Data |
---|---|---|
520078ee JB |
1 | --- fontconfig-2.2.92/src/fcfreetype.c.orig 2003-09-06 21:40:41.000000000 +0200 |
2 | +++ fontconfig-2.2.92/src/fcfreetype.c 2003-12-22 22:03:40.219493768 +0100 | |
3 | @@ -48,16 +48,16 @@ | |
4 | #include <stdio.h> | |
5 | #include <string.h> | |
6 | #include "fcint.h" | |
7 | -#include <freetype/freetype.h> | |
8 | -#include <freetype/internal/ftobjs.h> | |
9 | -#include <freetype/tttables.h> | |
10 | -#include <freetype/ftsnames.h> | |
11 | -#include <freetype/ttnameid.h> | |
12 | -#include <freetype/t1tables.h> | |
13 | +#include <ft2build.h> | |
14 | +#include FT_FREETYPE_H | |
15 | +#include FT_INTERNAL_OBJECTS_H | |
16 | +#include FT_TRUETYPE_TABLES_H | |
17 | +#include FT_SFNT_NAMES_H | |
18 | +#include FT_TRUETYPE_IDS_H | |
19 | +#include FT_TYPE1_TABLES_H | |
20 | ||
21 | #if HAVE_FT_GET_BDF_PROPERTY | |
22 | -#include <freetype/ftbdf.h> | |
23 | -#include <freetype/ftmodule.h> | |
24 | +#include FT_BDF_H | |
25 | #define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \ | |
26 | (f)->driver->root.clazz->get_interface) | |
27 | #define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \ | |
28 | --- fontconfig-2.2.92/fontconfig/fcfreetype.h.orig 2003-07-20 19:14:47.000000000 +0200 | |
29 | +++ fontconfig-2.2.92/fontconfig/fcfreetype.h 2003-12-22 21:59:51.199310128 +0100 | |
30 | @@ -24,7 +24,8 @@ | |
31 | ||
32 | #ifndef _FCFREETYPE_H_ | |
33 | #define _FCFREETYPE_H_ | |
34 | -#include <freetype/freetype.h> | |
35 | +#include <ft2build.h> | |
36 | +#include FT_FREETYPE_H | |
37 | ||
38 | _FCFUNCPROTOBEGIN | |
39 |