From 84683f19b4d1c712281036bcabf8dc623e64b26a Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Tue, 18 Jul 2006 18:16:12 -0400
Subject: get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
 Get rid of almost all uses of these definitions.  They're still defined for
 delinquent out-of-tree drivers, and also for the Mesa build.  As well as for
 miinitext.c.  But largely gone.

---
 hw/dmx/glxProxy/Makefile.am  | 4 ++--
 hw/dmx/glxProxy/glxscreens.c | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'hw/dmx/glxProxy')

diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
index a798647cc..2f4a3b708 100644
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -31,8 +31,8 @@ libglxproxy_a_SOURCES = compsize.c \
                         renderpixswap.c \
                         unpack.h
 
-AM_CFLAGS = @SERVER_DEFINES@ \
-            @MODULE_DEFINES@ \
+AM_CFLAGS = \
+ \
             -I$(top_srcdir)/hw/dmx \
             -I$(top_srcdir)/include \
             -I$(top_srcdir)/GL/include \
diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c
index a7d4ce13d..2f6359553 100644
--- a/hw/dmx/glxProxy/glxscreens.c
+++ b/hw/dmx/glxProxy/glxscreens.c
@@ -48,12 +48,7 @@
 
 #include "glxserver.h"
 
-#ifdef IN_MODULE
 #include <xf86_ansic.h>
-#else
-#include <string.h>
-#include <signal.h>
-#endif
 
 #include <windowstr.h>
 
-- 
cgit v1.2.3