From 84683f19b4d1c712281036bcabf8dc623e64b26a Mon Sep 17 00:00:00 2001 From: Daniel Stone 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. --- fb/Makefile.am | 2 +- fb/fb24_32.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'fb') 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 -#ifdef XFree86LOADER -#include "xf86.h" -#endif #include "fb.h" -- cgit v1.2.3