diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:42 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:42 +0000 |
| commit | 591dcad65f73450a07ac7477a3a827d95eb6f726 (patch) | |
| tree | d39091468270df7225717439077c308485c23026 /include | |
| parent | c7e70c7e31897e00caaeb177176a8c24b834bc78 (diff) | |
| download | xorg-lib-libXft-591dcad65f73450a07ac7477a3a827d95eb6f726.tar.gz | |
Merging XORG-CURRENT into trunkXORG-6_7_99_1XACE-SELINUX-MERGECOMPOSITEWRAP
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/Xft/Xft.h | 11 | ||||
| -rw-r--r-- | include/X11/Xft/XftCompat.h | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h index db3cd24..d6199b1 100644 --- a/include/X11/Xft/Xft.h +++ b/include/X11/Xft/Xft.h @@ -1,7 +1,6 @@ /* - * $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. + * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,9 +24,15 @@ #ifndef _XFT_H_ #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 0 +#define XFT_REVISION 6 #define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION)) #define XftVersion XFT_VERSION diff --git a/include/X11/Xft/XftCompat.h b/include/X11/Xft/XftCompat.h index 470b750..34a6d08 100644 --- a/include/X11/Xft/XftCompat.h +++ b/include/X11/Xft/XftCompat.h @@ -1,7 +1,6 @@ /* - * $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. + * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -111,6 +110,7 @@ typedef FcObjectSet XftObjectSet; #define XftObjectSetDestroy FcObjectSetDestroy #define XftObjectSetVaBuild FcObjectSetVaBuild #define XftObjectSetBuild FcObjectSetBuild + #define XftFontSetMatch FcFontSetMatch #define XftFontSetDestroy FcFontSetDestroy |