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

xfree86: Finish removing font modules 

Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2016-03-14 11:37:32 -04:00
parent 69d1528bc3
commit 184fbf7541
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/doc/ddxDesign.xml
View File

@ -5560,10 +5560,6 @@ The fields are used as follows:
<term><constant>ABI_CLASS_EXTENSION</constant></term> <term><constant>ABI_CLASS_EXTENSION</constant></term>
<listitem><para>requires the extension module ABI <listitem><para>requires the extension module ABI
</para></listitem></varlistentry> </para></listitem></varlistentry>
<varlistentry>
<term><constant>ABI_CLASS_FONT</constant></term>
<listitem><para>requires the font module ABI
</para></listitem></varlistentry>
</variablelist> </variablelist>
</para></listitem></varlistentry> </para></listitem></varlistentry>
@ -5583,7 +5579,6 @@ The fields are used as follows:
ABI_VIDEODRV_VERSION ABI_VIDEODRV_VERSION
ABI_XINPUT_VERSION ABI_XINPUT_VERSION
ABI_EXTENSION_VERSION ABI_EXTENSION_VERSION
ABI_FONT_VERSION
</constant></literallayout> </constant></literallayout>
</para></listitem></varlistentry> </para></listitem></varlistentry>
@ -5603,7 +5598,6 @@ The fields are used as follows:
MOD_CLASS_NONE MOD_CLASS_NONE
MOD_CLASS_VIDEODRV MOD_CLASS_VIDEODRV
MOD_CLASS_XINPUT MOD_CLASS_XINPUT
MOD_CLASS_FONT
MOD_CLASS_EXTENSION MOD_CLASS_EXTENSION
</constant></literallayout> </constant></literallayout>

3
hw/xfree86/loader/loadmod.c
View File

@ -86,7 +86,6 @@ const ModuleVersions LoaderVersionInfo = {
ABI_VIDEODRV_VERSION, ABI_VIDEODRV_VERSION,
ABI_XINPUT_VERSION, ABI_XINPUT_VERSION,
ABI_EXTENSION_VERSION, ABI_EXTENSION_VERSION,
ABI_FONT_VERSION
}; };
static int ModuleDuplicated[] = { }; static int ModuleDuplicated[] = { };
@ -613,8 +612,6 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
ver = LoaderVersionInfo.xinputVersion; ver = LoaderVersionInfo.xinputVersion;
else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION)) else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION))
ver = LoaderVersionInfo.extensionVersion; ver = LoaderVersionInfo.extensionVersion;
else if (!strcmp(data->abiclass, ABI_CLASS_FONT))
ver = LoaderVersionInfo.fontVersion;
abimaj = GET_ABI_MAJOR(data->abiversion); abimaj = GET_ABI_MAJOR(data->abiversion);
abimin = GET_ABI_MINOR(data->abiversion); abimin = GET_ABI_MINOR(data->abiversion);