frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Adam Jackson 2012-04-26 16:42:20 -04:00
parent 4f8151c7a4
commit 69d1528bc3
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/xf86Module.h
View File

@ -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 */

1
hw/xfree86/loader/loader.c
View File

@ -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;