remove obsolete vendor defines
Remove random behaviour changes for SGI and MetroLink.
This commit is contained in:
parent
f7919c2879
commit
984babe86b
|
@ -667,13 +667,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
|
|||
if (!feedc)
|
||||
return FALSE;
|
||||
feedc->CtrlProc = controlProc;
|
||||
#ifdef sgi
|
||||
feedc->ctrl.num = 1;
|
||||
feedc->ctrl.den = 1;
|
||||
feedc->ctrl.threshold = 1;
|
||||
#else
|
||||
feedc->ctrl = defaultPointerControl;
|
||||
#endif
|
||||
feedc->ctrl.id = 0;
|
||||
if ( (feedc->next = dev->ptrfeed) )
|
||||
feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1;
|
||||
|
|
|
@ -271,10 +271,6 @@ long Memory_fail = 0;
|
|||
#include <stdlib.h> /* for random() */
|
||||
#endif
|
||||
|
||||
#ifdef sgi
|
||||
int userdefinedfontpath = 0;
|
||||
#endif /* sgi */
|
||||
|
||||
char *dev_tty_from_init = NULL; /* since we need to parse it anyway */
|
||||
|
||||
OsSigHandlerPtr
|
||||
|
@ -843,9 +839,6 @@ ProcessCommandLine(int argc, char *argv[])
|
|||
{
|
||||
if(++i < argc)
|
||||
{
|
||||
#ifdef sgi
|
||||
userdefinedfontpath = 1;
|
||||
#endif /* sgi */
|
||||
defaultFontPath = argv[i];
|
||||
}
|
||||
else
|
||||
|
|
|
@ -150,11 +150,7 @@ unsigned ndx;
|
|||
break;
|
||||
default:
|
||||
ErrorF("unknown key behavior 0x%04x\n",behavior.type);
|
||||
#if defined(MetroLink)
|
||||
return;
|
||||
#else
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
XkbHandleActions(keybd,keybd,xE,count);
|
||||
|
|
Loading…
Reference in New Issue
Block a user