xserver: Branch 'master' - 2 commits

[Adam Jackson]

 hw/dmx/dmx.c                        |    1 -
 hw/dmx/input/dmxeq.c                |    1 -
 hw/dmx/input/dmxinputinit.c         |    1 -
 hw/xfree86/common/xf86Xinput.c      |    1 -
 hw/xfree86/dixmods/extmod/modinit.c |    9 ---------
 5 files changed, 13 deletions(-)

New commits:
commit 57bed76e218471b60d340b18c346d492f37798c2
Author: Tomas Carnecky <tom at dbservice.com>
Date:   Wed Mar 4 10:29:34 2009 -0500

    Remove dead EXTENSION_PROC_ARGS define
    
    Signed-off-by: Tomas Carnecky <tom at dbservice.com>

diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 10d9e22..56e5bb6 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -51,7 +51,6 @@
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
-#define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"
 #include "opaque.h"
 
diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c
index 86ba960..33e8771 100644
--- a/hw/dmx/input/dmxeq.c
+++ b/hw/dmx/input/dmxeq.c
@@ -80,7 +80,6 @@
 #include "scrnintstr.h"         /* For screenInfo */
 
 #include <X11/extensions/XIproto.h>
-#define EXTENSION_PROC_ARGS void *
 
 #if DMX_EQ_DEBUG
 #define DMXDBG2(f,a,b)           dmxLog(dmxDebug,f,a,b)
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index 9a14044..29895c7 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -76,7 +76,6 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
-#define EXTENSION_PROC_ARGS void *
 #include "extinit.h"
 
 /* From XI.h */
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index df1ecb9..dcec423 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -74,7 +74,6 @@
 #include "exevents.h"	/* AddInputDevice */
 #include "exglobals.h"
 
-#define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"
 
 #include "windowstr.h"	/* screenIsSaved */
commit a6fb9f4ccfc69dc090b152e29142e3159f812166
Author: Tomas Carnecky <tom at dbservice.com>
Date:   Wed Mar 4 10:27:30 2009 -0500

    Remove dead XTest code from extmod
    
    Signed-off-by: Tomas Carnecky <tom at dbservice.com>

diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 9bcf51f..2995625 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -56,15 +56,6 @@ static ExtensionModule extensionModules[] = {
 	NULL
     },
 #endif
-#ifdef notyet
-    {
-	XTestExtensionInit,
-	XTestExtensionName,
-	&noTestExtensions,
-	NULL,
-	NULL
-    },
-#endif
 #ifdef SCREENSAVER
     {
 	ScreenSaverExtensionInit,