diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-03-14 11:37:32 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-03-14 11:37:32 -0400 |
| commit | 184fbf7541012090b8716c7eaf00895efd16d0ac (patch) | |
| tree | 78abb9be2e4cd1e98dacbd19188f62237663f6b0 | |
| parent | 69d1528bc35073331e281448dfb04eb4240ff472 (diff) | |
xfree86: Finish removing font modules
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | hw/xfree86/doc/ddxDesign.xml | 6 | ||||
| -rw-r--r-- | hw/xfree86/loader/loadmod.c | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index aed77a9f0..53647d066 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -5560,10 +5560,6 @@ The fields are used as follows: <term><constant>ABI_CLASS_EXTENSION</constant></term> <listitem><para>requires the extension module ABI </para></listitem></varlistentry> - <varlistentry> - <term><constant>ABI_CLASS_FONT</constant></term> - <listitem><para>requires the font module ABI - </para></listitem></varlistentry> </variablelist> </para></listitem></varlistentry> @@ -5583,7 +5579,6 @@ The fields are used as follows: ABI_VIDEODRV_VERSION ABI_XINPUT_VERSION ABI_EXTENSION_VERSION - ABI_FONT_VERSION </constant></literallayout> </para></listitem></varlistentry> @@ -5603,7 +5598,6 @@ The fields are used as follows: MOD_CLASS_NONE MOD_CLASS_VIDEODRV MOD_CLASS_XINPUT - MOD_CLASS_FONT MOD_CLASS_EXTENSION </constant></literallayout> diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 73dc1b8dc..702d4e747 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -86,7 +86,6 @@ const ModuleVersions LoaderVersionInfo = { ABI_VIDEODRV_VERSION, ABI_XINPUT_VERSION, ABI_EXTENSION_VERSION, - ABI_FONT_VERSION }; static int ModuleDuplicated[] = { }; @@ -613,8 +612,6 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data, ver = LoaderVersionInfo.xinputVersion; else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION)) ver = LoaderVersionInfo.extensionVersion; - else if (!strcmp(data->abiclass, ABI_CLASS_FONT)) - ver = LoaderVersionInfo.fontVersion; abimaj = GET_ABI_MAJOR(data->abiversion); abimin = GET_ABI_MINOR(data->abiversion); |