diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-18 18:16:12 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-18 18:17:38 -0400 |
| commit | 84683f19b4d1c712281036bcabf8dc623e64b26a (patch) | |
| tree | 94c61eca298da6f6200fcb8ba8a4d1009b1495b7 /hw/dmx | |
| parent | 881953813c7307f2aac4057b48d233e5f4a574cd (diff) | |
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.
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/dmx/config/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/dmx/dmx-config.h | 1 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/glxscreens.c | 5 | ||||
| -rw-r--r-- | hw/dmx/input/Makefile.am | 2 |
6 files changed, 5 insertions, 11 deletions
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 93abd7a0e..81b62f1fe 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -81,7 +81,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \ config/libdmxconfig.a \ @DMXMODULES_LIBS@ -Xdmx_CFLAGS = @SERVER_DEFINES@ \ +Xdmx_CFLAGS = \ -DHAVE_DMX_CONFIG_H \ $(GLX_INCS) \ $(GLX_DEFS) \ diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index 7376ec23a..fbc7f35a1 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -27,7 +27,7 @@ endif AM_YFLAGS = -d AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -I$(top_srcdir)/hw/dmx \ $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h index 11e8fb8e5..9647448dc 100644 --- a/hw/dmx/dmx-config.h +++ b/hw/dmx/dmx-config.h @@ -93,6 +93,5 @@ #undef DAMAGE #undef COMPOSITE #undef FONTCACHE -#undef XFree86LOADER #endif /* DMX_CONFIG_H */ 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> diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index d37c2a9ce..326506e77 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -60,7 +60,7 @@ GLX_DEFS = @GL_CFLAGS@ GLX_INCS = -I@MESA_SOURCE@/include endif -AM_CFLAGS = @SERVER_DEFINES@ \ +AM_CFLAGS = \ -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/xfree86/common \ $(GLX_INCS) \ |