From 984babe86bf82002b4d6589b2750c7b5a5489bd5 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 12 Aug 2006 21:43:38 +0300
Subject: [PATCH] remove obsolete vendor defines Remove random behaviour
 changes for SGI and MetroLink.

---
 dix/devices.c    | 6 ------
 os/utils.c       | 7 -------
 xkb/xkbPrKeyEv.c | 4 ----
 3 files changed, 17 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 15b32c648..bcf8f4fa6 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -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;
diff --git a/os/utils.c b/os/utils.c
index b15700f85..6bf862497 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -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
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index b2a7ab2c9..9944c8886 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -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);