summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86MiscExt.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/common/xf86MiscExt.c')
-rw-r--r--hw/xfree86/common/xf86MiscExt.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c
index 80fbf417d..bdb02cef0 100644
--- a/hw/xfree86/common/xf86MiscExt.c
+++ b/hw/xfree86/common/xf86MiscExt.c
@@ -459,12 +459,10 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd)
mseParamsPtr mse = structure;
InputInfoPtr pInfo;
MouseDevPtr pMse;
-#ifdef XFree86LOADER
pointer xf86MouseProtocolIDToName
= LoaderSymbol("xf86MouseProtocolIDToName");
if (!xf86MouseProtocolIDToName)
return MISC_RET_NOMODULE;
-#endif
if (mse->type < MTYPE_MICROSOFT
|| ( mse->type > MTYPE_EXPPS2
&& (mse->type!=MTYPE_OSMOUSE && mse->type!=MTYPE_XQUEUE)))
@@ -563,12 +561,8 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd)
pMse->chordMiddle = mse->chordmiddle;
pMse->mouseFlags = mse->flags;
-#ifdef XFree86LOADER
pMse->protocol = ((const char *(*)(MouseProtocolID))
xf86MouseProtocolIDToName)(pMse->protocolID);
-#else
- pMse->protocol = xf86MouseProtocolIDToName(pMse->protocolID);
-#endif
if (mse->device) {
if (MiscExtAuthorizeDevice(pInfo, mse->device)) {