diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-31 18:23:15 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-31 18:23:15 +0000 |
| commit | d9b828c2d1e6e4e2ceb750c1b925f0bc551a1443 (patch) | |
| tree | 82b7a1e14be8bbe9bc00d6c4ba3e04d842701f1c /lib/libXft/include/X11/Xft | |
| parent | 1767608620ad90b9b419a49afc48b354542653f7 (diff) | |
Update to libXft 2.1.14
Diffstat (limited to 'lib/libXft/include/X11/Xft')
| -rw-r--r-- | lib/libXft/include/X11/Xft/Xft.h.in (renamed from lib/libXft/include/X11/Xft/Xft.h) | 29 | ||||
| -rw-r--r-- | lib/libXft/include/X11/Xft/XftCompat.h | 2 |
2 files changed, 7 insertions, 24 deletions
diff --git a/lib/libXft/include/X11/Xft/Xft.h b/lib/libXft/include/X11/Xft/Xft.h.in index b4002682b..d66f2eca5 100644 --- a/lib/libXft/include/X11/Xft/Xft.h +++ b/lib/libXft/include/X11/Xft/Xft.h.in @@ -1,6 +1,4 @@ /* - * $Id: Xft.h,v 1.1 2006/11/25 17:21:40 matthieu Exp $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -26,14 +24,13 @@ #define _XFT_H_ /* - * Current Xft version number. This same number - * must appear in the Xft configure.ac file. Yes, - * it'a a pain to synchronize version numbers like this. - */ - -#define XFT_MAJOR 2 -#define XFT_MINOR 1 -#define XFT_REVISION 9 + * Current Xft version number, set from version in the Xft configure.ac file. + */ + +#undef XFT_MAJOR /* Will be substituted by configure */ +#undef XFT_MINOR /* Will be substituted by configure */ +#undef XFT_REVISION /* Will be substituted by configure */ + #define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION)) #define XftVersion XFT_VERSION @@ -129,16 +126,6 @@ XftColorFree (Display *dpy, Colormap cmap, XftColor *color); - -/* xftcore.c */ - -/* xftdir.c */ -FcBool -XftDirScan (FcFontSet *set, _Xconst char *dir, FcBool force); - -FcBool -XftDirSave (FcFontSet *set, _Xconst char *dir); - /* xftdpy.c */ Bool XftDefaultHasRender (Display *dpy); @@ -621,8 +608,6 @@ XftTextRenderUtf16 (Display *dpy, FcEndian endian, int len); -/* xftstr.c */ - /* xftxlfd.c */ FcPattern * XftXlfdParse (_Xconst char *xlfd_orig, Bool ignore_scalable, Bool complete); diff --git a/lib/libXft/include/X11/Xft/XftCompat.h b/lib/libXft/include/X11/Xft/XftCompat.h index 447547caf..0fced03a5 100644 --- a/lib/libXft/include/X11/Xft/XftCompat.h +++ b/lib/libXft/include/X11/Xft/XftCompat.h @@ -1,6 +1,4 @@ /* - * $Id: XftCompat.h,v 1.1 2006/11/25 17:21:40 matthieu Exp $ - * * Copyright © 2001 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its |