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 /os | |
| 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 'os')
| -rw-r--r-- | os/Makefile.am | 2 | ||||
| -rw-r--r-- | os/utils.c | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/os/Makefile.am b/os/Makefile.am index d7fd58d28..71e24c086 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libos.la libcwrapper.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) # FIXME: Add support for these in configure.ac K5AUTH_SOURCES = k5auth.c diff --git a/os/utils.c b/os/utils.c index e41c3664b..de3e7c9ec 100644 --- a/os/utils.c +++ b/os/utils.c @@ -139,13 +139,9 @@ _X_EXPORT Bool noTestExtensions; _X_EXPORT Bool noBigReqExtension = FALSE; #endif #ifdef COMPOSITE - #ifdef XFree86Server - /* COMPOSITE is disabled by default for now until the - * interface is stable */ - #define COMPOSITE_DEFAULT FALSE - #else - #define COMPOSITE_DEFAULT TRUE - #endif + /* COMPOSITE is disabled by default for now until the + * interface is stable */ + #define COMPOSITE_DEFAULT FALSE _X_EXPORT Bool noCompositeExtension = !COMPOSITE_DEFAULT; #endif |