diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-04-26 16:42:20 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-03-14 11:23:51 -0400 |
| commit | 69d1528bc35073331e281448dfb04eb4240ff472 (patch) | |
| tree | b0446f38360c3e35e83fa3273d629e53f85e1bef | |
| parent | 4f8151c7a4bcf2d55848e70c83b2f9ce458cf316 (diff) | |
xfree86: Font modules aren't a real thing
There are no longer any loadable font modules (not that they ever did
much in the first place), so stop pretending they're a defined ABI
surface.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | hw/xfree86/common/xf86Module.h | 3 | ||||
| -rw-r--r-- | hw/xfree86/loader/loader.c | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 7a8b7ab71..fc6112004 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -62,7 +62,6 @@ typedef enum { #define ABI_CLASS_VIDEODRV "X.Org Video Driver" #define ABI_CLASS_XINPUT "X.Org XInput driver" #define ABI_CLASS_EXTENSION "X.Org Server Extension" -#define ABI_CLASS_FONT "X.Org Font Renderer" #define ABI_MINOR_MASK 0x0000FFFF #define ABI_MAJOR_MASK 0xFFFF0000 @@ -83,7 +82,6 @@ typedef enum { #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(21, 0) #define ABI_XINPUT_VERSION SET_ABI_VERSION(22, 1) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0) -#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) #define MODINFOSTRING1 0xef23fdc5 #define MODINFOSTRING2 0x10dc023a @@ -122,7 +120,6 @@ typedef enum { #define MOD_CLASS_NONE NULL #define MOD_CLASS_VIDEODRV "X.Org Video Driver" #define MOD_CLASS_XINPUT "X.Org XInput Driver" -#define MOD_CLASS_FONT "X.Org Font Renderer" #define MOD_CLASS_EXTENSION "X.Org Server Extension" /* This structure is expected to be returned by the initfunc */ diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 31329846a..c8d7540b5 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -180,7 +180,6 @@ LoaderGetABIVersion(const char *abiclass) {ABI_CLASS_VIDEODRV, LoaderVersionInfo.videodrvVersion}, {ABI_CLASS_XINPUT, LoaderVersionInfo.xinputVersion}, {ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion}, - {ABI_CLASS_FONT, LoaderVersionInfo.fontVersion}, {NULL, 0} }; int i; |