summaryrefslogtreecommitdiff
path: root/fb
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2006-07-18 18:16:12 -0400
committerDaniel Stone <daniels@endtroducing.fooishbar.org>2006-07-18 18:17:38 -0400
commit84683f19b4d1c712281036bcabf8dc623e64b26a (patch)
tree94c61eca298da6f6200fcb8ba8a4d1009b1495b7 /fb
parent881953813c7307f2aac4057b48d233e5f4a574cd (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 'fb')
-rw-r--r--fb/Makefile.am2
-rw-r--r--fb/fb24_32.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/fb/Makefile.am b/fb/Makefile.am
index 7b024aa75..11b2d2fea 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
-I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/hw/xfree86/common
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
if XORG
sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h
diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index d18ef70ce..92b8e1b22 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -28,9 +28,6 @@
#endif
#include <string.h>
-#ifdef XFree86LOADER
-#include "xf86.h"
-#endif
#include "fb.h"