From 1bbd5e49b1dcc2e3f9785bd2bb58f946b9998099 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Thu, 16 Feb 2006 04:59:45 +0000
Subject: [PATCH] Bug #5869: Remove traces of EXTMODULE define, which doesn't
 appear to be     useful any more. (George Fufutos)

---
 ChangeLog                             | 10 ++++++++++
 XTrap/xtrapddmi.c                     |  2 --
 XTrap/xtrapdi.c                       |  4 +---
 Xext/Makefile.am                      |  2 +-
 hw/xfree86/dixmods/extmod/Makefile.am |  2 +-
 hw/xfree86/dixmods/extmod/xf86dga2.c  |  2 --
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b42b38efb..98e0bd5f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-15  Eric Anholt  <anholt@FreeBSD.org>
+
+	* XTrap/xtrapddmi.c:
+	* XTrap/xtrapdi.c:
+	* Xext/Makefile.am:
+	* hw/xfree86/dixmods/extmod/Makefile.am:
+	* hw/xfree86/dixmods/extmod/xf86dga2.c: (XFree86DGARegister):
+	Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be
+	useful any more. (George Fufutos)
+
 2006-02-15  Eric Anholt  <anholt@FreeBSD.org>
 
 	* hw/xfree86/dixmods/laymodule.c:
diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c
index 3f3720f5f..1b598b79d 100644
--- a/XTrap/xtrapddmi.c
+++ b/XTrap/xtrapddmi.c
@@ -42,7 +42,6 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#ifndef EXTMODULE
 #include <errno.h>
 #include <X11/Xos.h>
 #ifdef PC
@@ -50,7 +49,6 @@ SOFTWARE.
 # include "io.h"
 # define O_NDELAY 0L
 #endif
-#endif
 
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index 8b045cd19..26da8cbb4 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/XTrap/xtrapdi.c,v 1.5 2005/07/03 08:53:36 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/XTrap/xtrapdi.c,v 1.6 2006/02/10 22:00:19 anholt Exp $ */
 /* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
@@ -55,11 +55,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#ifndef EXTMODULE
 #include <stdio.h>
 #include <errno.h>
 #include <X11/Xos.h>
-#endif
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "input.h"              /* Server DevicePtr definitions */
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 43753f396..f92fbda61 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -130,7 +130,7 @@ libXext_la_SOURCES =		$(BUILTIN_SRCS) $(MODULE_SRCS)
 libXextbuiltin_la_SOURCES =	$(BUILTIN_SRCS)
 
 libXextmodule_la_SOURCES =	$(MODULE_SRCS)
-libXextmodule_la_CFLAGS = 	$(AM_CFLAGS) @MODULE_DEFINES@ -DEXTMODULE
+libXextmodule_la_CFLAGS = 	$(AM_CFLAGS) @MODULE_DEFINES@
 
 EXTRA_DIST = \
 	README.xtest1-ddx \
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index cfa15f32b..0b1245dd7 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -11,7 +11,7 @@ if XV
 XV_SRCS = xvmod.c xvmodproc.h
 endif
 
-AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
 INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/afb \
            -I$(top_srcdir)/mfb \
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 3ea19b431..1f52d7416 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -762,10 +762,8 @@ ProcXDGADispatch (ClientPtr client)
     }
 }
 
-#ifdef EXTMODULE
 void
 XFree86DGARegister(INITARGS)
 {
   XDGAEventBase = &DGAEventBase; 
 }
-#endif