From dbca69c8a4f3e2d1ccb4f89152213b2861b33af6 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sun, 2 Nov 2008 15:26:35 +0000
Subject: xserver 1.5.2. tested by ckuethe@, oga@, and others.

---
 xserver/Xext/xcmisc.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'xserver/Xext/xcmisc.c')

diff --git a/xserver/Xext/xcmisc.c b/xserver/Xext/xcmisc.c
index 8c7a86e6a..a42d2e210 100644
--- a/xserver/Xext/xcmisc.c
+++ b/xserver/Xext/xcmisc.c
@@ -48,10 +48,6 @@ from The Open Group.
 #define UINT32_MAX 0xffffffffU
 #endif
 
-#if 0
-static unsigned char XCMiscCode;
-#endif
-
 static void XCMiscResetProc(
     ExtensionEntry * /* extEntry */
 );
@@ -68,20 +64,9 @@ static DISPATCH_PROC(SProcXCMiscGetXIDRange);
 void
 XCMiscExtensionInit(INITARGS)
 {
-#if 0
-    ExtensionEntry *extEntry;
-
-    if ((extEntry = AddExtension(XCMiscExtensionName, 0, 0,
-				ProcXCMiscDispatch, SProcXCMiscDispatch,
-				XCMiscResetProc, StandardMinorOpcode)) != 0)
-	XCMiscCode = (unsigned char)extEntry->base;
-#else
-    (void) AddExtension(XCMiscExtensionName, 0, 0,
-			ProcXCMiscDispatch, SProcXCMiscDispatch,
-			XCMiscResetProc, StandardMinorOpcode);
-#endif
-
-    DeclareExtensionSecurity(XCMiscExtensionName, TRUE);
+    AddExtension(XCMiscExtensionName, 0, 0,
+		 ProcXCMiscDispatch, SProcXCMiscDispatch,
+		 XCMiscResetProc, StandardMinorOpcode);
 }
 
 /*ARGSUSED*/
-- 
cgit v1.2.3