summaryrefslogtreecommitdiff
path: root/mfb
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 /mfb
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 'mfb')
-rw-r--r--mfb/Makefile.am2
-rw-r--r--mfb/maskbits.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/mfb/Makefile.am b/mfb/Makefile.am
index f72867e22..fe0bb1c26 100644
--- a/mfb/Makefile.am
+++ b/mfb/Makefile.am
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmfb.la
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
diff --git a/mfb/maskbits.h b/mfb/maskbits.h
index ed5cc2687..d5e1eba58 100644
--- a/mfb/maskbits.h
+++ b/mfb/maskbits.h
@@ -253,7 +253,7 @@ extern PixelType mfbGetmask(int);
#define BitLeft(b,s) SCRLEFT(b,s)
#define BitRight(b,s) SCRRIGHT(b,s)
-#ifdef XFree86Server
+#if 1
#define LONG2CHARSSAMEORDER(x) ((MfbBits)(x))
#define LONG2CHARSDIFFORDER( x ) ( ( ( ( x ) & (MfbBits)0x000000FF ) << 0x18 ) \
| ( ( ( x ) & (MfbBits)0x0000FF00 ) << 0x08 ) \