diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:09 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:09 +0000 |
| commit | 1781965aa5fac8f0737251ca883301e1aec7b12b (patch) | |
| tree | 564785607517c63f64f4eb098fc7c91690469bd6 /include | |
| parent | ac1033d4dc0ff95ab31dd2eb4752e7b4520fe819 (diff) | |
| download | xorg-lib-libXft-1781965aa5fac8f0737251ca883301e1aec7b12b.tar.gz | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/Xft/Xft.h | 5 | ||||
| -rw-r--r-- | include/X11/Xft/XftCompat.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h index edba002..db3cd24 100644 --- a/include/X11/Xft/Xft.h +++ b/include/X11/Xft/Xft.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/Xft.h,v 1.32 2003/02/25 21:57:53 dawes Exp $ + * $XFree86: xc/lib/Xft/Xft.h,v 1.33 2003/11/20 22:36:33 dawes Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -32,7 +32,8 @@ #define XftVersion XFT_VERSION #include <stdarg.h> -#include <freetype/freetype.h> +#include <ft2build.h> +#include FT_FREETYPE_H #include <fontconfig/fontconfig.h> #include <X11/extensions/Xrender.h> diff --git a/include/X11/Xft/XftCompat.h b/include/X11/Xft/XftCompat.h index 9ddfc59..470b750 100644 --- a/include/X11/Xft/XftCompat.h +++ b/include/X11/Xft/XftCompat.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/XftCompat.h,v 1.5 2002/10/02 07:02:32 keithp Exp $ + * $XFree86: xc/lib/Xft/XftCompat.h,v 1.6 2003/08/06 14:03:59 eich Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * @@ -111,9 +111,6 @@ typedef FcObjectSet XftObjectSet; #define XftObjectSetDestroy FcObjectSetDestroy #define XftObjectSetVaBuild FcObjectSetVaBuild #define XftObjectSetBuild FcObjectSetBuild - -#define XftListFontsPatternObjects FcListFontsPatternObjects - #define XftFontSetMatch FcFontSetMatch #define XftFontSetDestroy FcFontSetDestroy |