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.

GL/glx/Makefile.am

@@ -13,9 +13,7 @@ AM_CFLAGS = \
 	@DRIPROTO_CFLAGS@ \
 	-I@MESA_SOURCE@/src/mesa/glapi \
 	-I@MESA_SOURCE@/src/mesa/main \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	-DNO_LIBCWRAPPER \
 	@GLX_DEFINES@
 

GL/mesa/X/Makefile.am

@@ -20,9 +20,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
 # symbol means "being built in the server"
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@ \
 	-DXFree86Server
 

GL/mesa/array_cache/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libac.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/glapi/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libglapi.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/main/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libmain.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/math/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libmath.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/shader/Makefile.am

@@ -4,9 +4,7 @@ noinst_LTLIBRARIES = libshader.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/shader/grammar/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libgrammar.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/shader/slang/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libslang.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/swrast/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libswrast.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/swrast_setup/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libss.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

GL/mesa/tnl/Makefile.am

@@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libtnl.la
 
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
+	-DXFree86Server \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
 	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \

XTrap/Makefile.am

@@ -1,5 +1,5 @@
 noinst_LTLIBRARIES = libxtrap.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
 
 libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c

Xext/Makefile.am

@@ -12,7 +12,7 @@ endif
 
 INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
 
 if XORG
 sdk_HEADERS = xvdix.h xvmcext.h

Xi/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libXi.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
 
 libXi_la_SOURCES =	\
 	allowev.c \

afb/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libafb.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
 
 libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c
 

cfb/Makefile.am

@@ -9,7 +9,7 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \
 
 libcfb_la_LIBADD = ../mfb/libmfb.la
 
-AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS)
 
 INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support  -I$(top_srcdir)/hw/xfree86/common
 

cfb32/Makefile.am

@@ -6,4 +6,4 @@ libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
 
 INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
 
-AM_CFLAGS = -DPSZ=32  $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = -DPSZ=32  $(PLATFORMDEFS)

composite/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libcomposite.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
 
 libcomposite_la_SOURCES = 	\
 	compalloc.c		\

configure.ac

@@ -865,11 +865,6 @@ dnl ---------------------------------------------------------------------------
 dnl DDX section.
 dnl ---------------------------------------------------------------------------
 
-dnl These are used to define Xorg module, loader and general server defines
-MODULE_DEFINES=""
-LOADER_DEFINES=""
-SERVER_DEFINES=""
-
 dnl DMX DDX
 
 AC_MSG_CHECKING([whether to build Xdmx DDX])
@@ -1244,11 +1239,6 @@ int main () {
 	AC_SUBST([XORG_CFLAGS])
 	AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
 
-	dnl Module defines are used in the Xorg server and the drivers
-	MODULE_DEFINES="$MODULE_DEFINES -DIN_MODULE -DXFree86Module"
-	LOADER_DEFINES="$LOADER_DEFINES -DXFree86LOADER"
-	SERVER_DEFINES="$SERVER_DEFINES -DXFree86Server"
-
 	dnl these only go in xorg-config.h
 	XF86CONFIGFILE="xorg.conf"
 	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
@@ -1256,6 +1246,7 @@ int main () {
 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
 	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
@@ -1593,10 +1584,6 @@ AM_CONDITIONAL(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes])
 AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd])
 AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun])
 
-AC_SUBST([MODULE_DEFINES])
-AC_SUBST([LOADER_DEFINES])
-AC_SUBST([SERVER_DEFINES])
-
 CFLAGS="$XSERVER_CFLAGS $CFLAGS"
 AC_SUBST([CFLAGS])
 

damageext/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libdamageext.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
 
 libdamageext_la_SOURCES = 	\
 	damageext.c		\

dbe/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libdbe.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(DIX_CFLAGS)
 
 if XORG
 sdk_HEADERS = dbestruct.h

dix/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libdix.la libxpstubs.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \
+AM_CFLAGS = $(DIX_CFLAGS) \
 	-DVENDOR_STRING=\""@VENDOR_STRING@"\" \
 	-DVENDOR_RELEASE="@VENDOR_RELEASE@"
 

dix/atom.c

@@ -54,6 +54,8 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
+#include <stdio.h>
+#include <string.h>
 #include "misc.h"
 #include "resource.h"
 #include "dix.h"

dix/colormap.c

@@ -56,6 +56,9 @@ SOFTWARE.
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
 #include "misc.h"
 #include "dix.h"
 #include "colormapst.h"

dix/events.c

@@ -3019,9 +3019,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
 		butc->buttonsDown++;
 	    butc->motionMask = ButtonMotionMask;
 	    *kptr |= bit;
-#if !defined(XFree86Server) || !defined(XINPUT)
-	    xE->u.u.detail = butc->map[key];
-#endif
 	    if (xE->u.u.detail == 0)
 		return;
 	    if (xE->u.u.detail <= 5)
@@ -3038,9 +3035,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
 	    if (!butc->buttonsDown)
 		butc->motionMask = 0;
 	    *kptr &= ~bit;
-#if !defined(XFree86Server) || !defined(XINPUT)
-	    xE->u.u.detail = butc->map[key];
-#endif
 	    if (xE->u.u.detail == 0)
 		return;
 	    if (xE->u.u.detail <= 5)

exa/Makefile.am

@@ -12,7 +12,7 @@ INCLUDES = \
 	$(XORG_INCS) \
 	-I$(srcdir)/../miext/cw
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ $(DIX_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
 
 libexa_la_SOURCES = \
 	exa.c \

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

fb/fb24_32.c

@@ -28,9 +28,6 @@
 #endif
 
 #include <string.h>
-#ifdef XFree86LOADER
-#include "xf86.h"
-#endif
 
 #include "fb.h"
 

hw/darwin/quartz/xpr/dri.c

@@ -35,13 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#else
 #include <sys/time.h>
 #include <unistd.h>
-#endif
 
 #define NEED_REPLIES
 #define NEED_EVENTS

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) \

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 \

hw/dmx/dmx-config.h

@@ -93,6 +93,5 @@
 #undef DAMAGE
 #undef COMPOSITE
 #undef FONTCACHE
-#undef XFree86LOADER
 
 #endif /* DMX_CONFIG_H */

hw/dmx/glxProxy/Makefile.am

@@ -31,8 +31,8 @@ libglxproxy_a_SOURCES = compsize.c \
                         renderpixswap.c \
                         unpack.h
 
-AM_CFLAGS = @SERVER_DEFINES@ \
+AM_CFLAGS = \
-            @MODULE_DEFINES@ \
+ \
             -I$(top_srcdir)/hw/dmx \
             -I$(top_srcdir)/include \
             -I$(top_srcdir)/GL/include \

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>
 

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) \

hw/vfb/Makefile.am

@@ -21,7 +21,7 @@ Xvfb_LDFLAGS =
 AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
             -DNO_HW_ONLY_EXTS \
             -DNO_MODULE_EXTS \
-            @SERVER_DEFINES@ \
+ \
             $(XVFBMODULES_CFLAGS)
 
 # Man page

hw/xfree86/Makefile.am

@@ -16,7 +16,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
 
 bin_PROGRAMS = Xorg
 
-AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = @XORG_CFLAGS@
 INCLUDES = @XORG_INCS@ 
 
 Xorg_SOURCES = xorg.c

hw/xfree86/common/Makefile.am

@@ -103,4 +103,4 @@ if LNXACPI
 XORG_CFLAGS += -DHAVE_ACPI
 endif
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)

hw/xfree86/common/compiler.h

@@ -1605,17 +1605,13 @@ extern void outl(unsigned int a, unsigned int l);
 #    endif
 #    ifndef SCO325
 #     if defined(__UNIXWARE__)
-#      if defined(IN_MODULE)
 #     /* avoid including <sys/types.h> for <sys/inline.h> on UnixWare */
-#       define ushort unsigned short
+#      define ushort unsigned short
-#       define ushort_t unsigned short
+#      define ushort_t unsigned short
-#       define ulong unsigned long
+#      define ulong unsigned long
-#       define ulong_t unsigned long
+#      define ulong_t unsigned long
-#       define uint_t unsigned int
+#      define uint_t unsigned int
-#       define uchar_t unsigned char
+#      define uchar_t unsigned char
-#      else
-#       include <sys/types.h>
-#      endif /* IN_MODULE */
 #     endif /* __UNIXWARE__ */
 #     if !defined(sgi) && !defined(__SUNPRO_C)
 #      include <sys/inline.h>

hw/xfree86/common/xf86.h

@@ -354,10 +354,8 @@ int  xf86RegisterRootWindowProperty(int ScrnIndex, Atom	property, Atom type,
 				    pointer value);
 Bool xf86IsUnblank(int mode);
 
-#ifdef XFree86LOADER
 void xf86AddModuleInfo(ModuleInfoPtr info, pointer module);
 void xf86DeleteModuleInfo(int idx);
-#endif
 
 /* xf86Debug.c */
 #ifdef BUILDDEBUG

hw/xfree86/common/xf86Config.c

@@ -513,7 +513,6 @@ fixup_video_driver_list(char **drivers)
 static char **
 GenerateDriverlist(char * dirname, char * drivernames)
 {
-#ifdef XFree86LOADER
     char **ret;
     const char *subdirs[] = { dirname, NULL };
     static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
@@ -524,39 +523,6 @@ GenerateDriverlist(char * dirname, char * drivernames)
         fixup_video_driver_list(ret);
 
     return ret;
-#else /* non-loadable server */
-    char *cp, **driverlist;
-    int count;
-
-    /* Count the number needed */
-    count = 0;
-    cp = drivernames;
-    while (*cp) {
-	while (*cp && isspace(*cp)) cp++;
-	if (!*cp) break;
-	count++;
-	while (*cp && !isspace(*cp)) cp++;
-    }
-
-    if (!count)
-	return NULL;
-
-    /* Now allocate the array of pointers to 0-terminated driver names */
-    driverlist = (char **)xnfalloc((count + 1) * sizeof(char *));
-    count = 0;
-    cp = drivernames;
-    while (*cp) {
-	while (*cp && isspace(*cp)) cp++;
-	if (!*cp) break;
-	driverlist[count++] = cp;
-	while (*cp && !isspace(*cp)) cp++;
-	if (!*cp) break;
-	*cp++ = 0;
-    }
-    driverlist[count] = NULL;
-
-    return driverlist;
-#endif
 }
 
 
@@ -732,7 +698,6 @@ configFiles(XF86ConfFilesPtr fileconf)
   }
   
   
-#ifdef XFree86LOADER
   /* ModulePath */
 
   if (fileconf) {
@@ -743,7 +708,6 @@ configFiles(XF86ConfFilesPtr fileconf)
   }
 
   xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
-#endif
 
 #if 0
   /* LogFile */

hw/xfree86/common/xf86Configure.c

@@ -37,9 +37,7 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "os.h"
-#ifdef XFree86LOADER
 #include "loaderProcs.h"
-#endif
 #include "xf86.h"
 #include "xf86Config.h"
 #include "xf86_OSlib.h"
@@ -602,7 +600,6 @@ configureFlagsSection (void)
 static XF86ConfModulePtr
 configureModuleSection (void)
 {
-#ifdef XFree86LOADER
     char **elist, **el;
     /* Find the list of extension modules. */
     const char *esubdirs[] = {
@@ -613,10 +610,8 @@ configureModuleSection (void)
 	"fonts",
 	NULL
     };
-#endif
     parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)
 
-#ifdef XFree86LOADER
     elist = LoaderListDirs(esubdirs, NULL);
     if (elist) {
 	for (el = elist; *el; el++) {
@@ -653,7 +648,6 @@ configureModuleSection (void)
     	}
 	xfree(elist);
     }
-#endif
 
     return ptr;
 }
@@ -663,10 +657,8 @@ configureFilesSection (void)
 {
     parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec)
 
-#ifdef XFree86LOADER
    if (xf86ModulePath)
        ptr->file_modulepath = strdup(xf86ModulePath);
-#endif
    if (defaultFontPath)
        ptr->file_fontpath = strdup(defaultFontPath);
    if (rgbPath)
@@ -788,10 +780,8 @@ DoConfigure()
     for (vl = vlist; *vl; vl++)
 	ErrorF("\t%s\n", *vl);
 
-#ifdef XFree86LOADER
     /* Load all the drivers that were found. */
     xf86LoadModules(vlist, NULL);
-#endif /* XFree86LOADER */
 
     xfree(vlist);
 

hw/xfree86/common/xf86DGA.c

@@ -63,11 +63,7 @@ DGACopyModeInfo(
    XDGAModePtr xmode
 );
 
-#if defined(XFree86LOADER) || !defined(XFreeXDGA)
 _X_EXPORT int *XDGAEventBase = NULL;
-#else
-_X_EXPORT int *XDGAEventBase = &DGAEventBase;
-#endif
 
 #define DGA_GET_SCREEN_PRIV(pScreen) \
 	((DGAScreenPtr)((pScreen)->devPrivates[DGAScreenIndex].ptr))

hw/xfree86/common/xf86DoProbe.c

@@ -40,10 +40,8 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "os.h"
-#ifdef XFree86LOADER
 #include "loaderProcs.h"
 #include "xf86Config.h"
-#endif /* XFree86LOADER */
 #include "xf86_OSlib.h"
 #include "xf86.h"
 #include "xf86Priv.h"
@@ -55,7 +53,6 @@ DoProbe()
     Bool probeResult;
     Bool ioEnableFailed = FALSE;
     
-#ifdef XFree86LOADER
     /* Find the list of video driver modules. */
     char **list = xf86DriverlistFromCompile();
     char **l;
@@ -70,7 +67,6 @@ DoProbe()
 
     /* Load all the drivers that were found. */
     xf86LoadModules(list, NULL);
-#endif /* XFree86LOADER */
 
     /* Disable PCI devices */
     xf86AccessInit();

hw/xfree86/common/xf86DoScanPci.c

@@ -40,9 +40,7 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "os.h"
-#ifdef XFree86LOADER
 #include "loaderProcs.h"
-#endif
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Pci.h"
@@ -54,9 +52,7 @@ void DoScanPci(int argc, char **argv, int i)
   int j,skip,globalVerbose,scanpciVerbose;
   ScanPciSetupProcPtr PciSetup;
   ScanPciDisplayCardInfoProcPtr DisplayPCICardInfo;
-#ifdef XFree86LOADER
   int errmaj, errmin;
-#endif
 
   /*
    * first we need to finish setup of the OS so that we can call other
@@ -95,7 +91,6 @@ void DoScanPci(int argc, char **argv, int i)
   /*
    * now get the loader set up and load the scanpci module
    */
-#ifdef XFree86LOADER
   /* Initialise the loader */
   LoaderInit();
   /* Tell the loader the default module search path */
@@ -113,10 +108,6 @@ void DoScanPci(int argc, char **argv, int i)
   PciSetup = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
   DisplayPCICardInfo =
     (ScanPciDisplayCardInfoProcPtr)LoaderSymbol("ScanPciDisplayPCICardInfo");
-#else
-  PciSetup = ScanPciSetupPciIds;
-  DisplayPCICardInfo = ScanPciDisplayPCICardInfo;
-#endif
 
   if (!(*PciSetup)())
     FatalError("ScanPciSetupPciIds() failed\n");

hw/xfree86/common/xf86Globals.c

@@ -189,14 +189,12 @@ Bool xf86Initialising = FALSE;
 Bool xf86ProbeFailed = FALSE;
 Bool xf86DoProbe = FALSE;
 Bool xf86DoConfigure = FALSE;
-#ifdef XFree86LOADER
 DriverPtr *xf86DriverList = NULL;
 int xf86NumDrivers = 0;
 InputDriverPtr *xf86InputDriverList = NULL;
 int xf86NumInputDrivers = 0;
 ModuleInfoPtr *xf86ModuleInfoList = NULL;
 int xf86NumModuleInfos = 0;
-#endif
 int xf86NumScreens = 0;
 
 const char *xf86VisualNames[] = {

hw/xfree86/common/xf86Helper.c

@@ -70,7 +70,6 @@
 static int xf86ScrnInfoPrivateCount = 0;
 
 
-#ifdef XFree86LOADER
 /* Add a pointer to a new DriverRec to xf86DriverList */
 
 _X_EXPORT void
@@ -172,7 +171,6 @@ xf86DeleteModuleInfo(int idx)
 	xf86ModuleInfoList[idx] = NULL;
     }
 }
-#endif
 
 
 /* Allocate a new ScrnInfoRec in xf86Screens */
@@ -199,11 +197,7 @@ xf86AllocateScreen(DriverPtr drv, int flags)
 
     xf86Screens[i]->drv = drv;
     drv->refCount++;
-#ifdef XFree86LOADER
     xf86Screens[i]->module = DuplicateModule(drv->module, NULL);
-#else
-    xf86Screens[i]->module = NULL;
-#endif
     /*
      * set the initial access state. This will be modified after PreInit.
      * XXX Or should we do it some other place?
@@ -260,10 +254,8 @@ xf86DeleteScreen(int scrnIndex, int flags)
 
     xf86OptionListFree(pScrn->options);
 
-#ifdef XFree86LOADER
     if (pScrn->module)
 	UnloadModule(pScrn->module);
-#endif
 
     if (pScrn->drv)
 	pScrn->drv->refCount--;
@@ -321,11 +313,7 @@ xf86AllocateInput(InputDriverPtr drv, int flags)
 
     new->drv = drv;
     drv->refCount++;
-#ifdef XFree86LOADER
     new->module = DuplicateModule(drv->module, NULL);
-#else
-    new->module = NULL;
-#endif
     new->next = xf86InputDevs;
     xf86InputDevs = new;
     return new;
@@ -352,10 +340,8 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
 	pInp->free(pInp, 0);
 #endif
 
-#ifdef XFree86LOADER
     if (pInp->module)
 	UnloadModule(pInp->module);
-#endif
 
     if (pInp->drv)
 	pInp->drv->refCount--;
@@ -2381,17 +2367,12 @@ xf86GetVersion()
 _X_EXPORT CARD32
 xf86GetModuleVersion(pointer module)
 {
-#ifdef XFree86LOADER
     return (CARD32)LoaderGetModuleVersion(module);
-#else
-    return 0;
-#endif
 }
 
 _X_EXPORT pointer
 xf86LoadDrvSubModule(DriverPtr drv, const char *name)
 {
-#ifdef XFree86LOADER
     pointer ret;
     int errmaj = 0, errmin = 0;
 
@@ -2400,15 +2381,11 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name)
     if (!ret)
 	LoaderErrorMsg(NULL, name, errmaj, errmin);
     return ret;
-#else
-    return (pointer)1;
-#endif
 }
 
 _X_EXPORT pointer
 xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
 {
-#ifdef XFree86LOADER
     pointer ret;
     int errmaj = 0, errmin = 0;
 
@@ -2417,9 +2394,6 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
     if (!ret)
 	LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
     return ret;
-#else
-    return (pointer)1;
-#endif
 }
 
 /*
@@ -2428,9 +2402,7 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
 _X_EXPORT pointer
 xf86LoadOneModule(char *name, pointer opt)
 {
-#ifdef XFree86LOADER
     int errmaj, errmin;
-#endif
     char *Name;
     pointer mod;
     
@@ -2452,13 +2424,9 @@ xf86LoadOneModule(char *name, pointer opt)
 	return NULL;
     }
 
-#ifdef XFree86LOADER
     mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin);
     if (!mod)
 	LoaderErrorMsg(NULL, Name, errmaj, errmin);
-#else
-    mod = (pointer)1;
-#endif
     xfree(Name);
     return mod;
 }
@@ -2470,7 +2438,7 @@ xf86UnloadSubModule(pointer mod)
      * This is disabled for now.  The loader isn't smart enough yet to undo
      * relocations.
      */
-#if defined(XFree86LOADER) && 0
+#if 0
     UnloadSubModule(mod);
 #endif
 }
@@ -2478,59 +2446,47 @@ xf86UnloadSubModule(pointer mod)
 _X_EXPORT Bool
 xf86LoaderCheckSymbol(const char *name)
 {
-#ifdef XFree86LOADER
     return LoaderSymbol(name) != NULL;
-#else
-    return TRUE;
-#endif
 }
 
 _X_EXPORT void
 xf86LoaderReqSymLists(const char **list0, ...)
 {
-#ifdef XFree86LOADER
     va_list ap;
 
     va_start(ap, list0);
     LoaderVReqSymLists(list0, ap);
     va_end(ap);
-#endif
 }
 
 _X_EXPORT void
 xf86LoaderReqSymbols(const char *sym0, ...)
 {
-#ifdef XFree86LOADER
     va_list ap;
 
     va_start(ap, sym0);
     LoaderVReqSymbols(sym0, ap);
     va_end(ap);
-#endif
 }
 
 _X_EXPORT void
 xf86LoaderRefSymLists(const char **list0, ...)
 {
-#ifdef XFree86LOADER
     va_list ap;
 
     va_start(ap, list0);
     LoaderVRefSymLists(list0, ap);
     va_end(ap);
-#endif
 }
 
 _X_EXPORT void
 xf86LoaderRefSymbols(const char *sym0, ...)
 {
-#ifdef XFree86LOADER
     va_list ap;
 
     va_start(ap, sym0);
     LoaderVRefSymbols(sym0, ap);
     va_end(ap);
-#endif
 }
 
 

hw/xfree86/common/xf86InPriv.h

@@ -35,11 +35,7 @@
 #define _xf86InPriv_h
 
 /* xf86Globals.c */
-#ifdef XFree86LOADER
 extern InputDriverPtr *xf86InputDriverList;
-#else
-extern InputDriverPtr xf86InputDriverList[];
-#endif
 extern int xf86NumInputDrivers;
 
 /* xf86Xinput.c */

hw/xfree86/common/xf86Init.c

@@ -62,9 +62,7 @@
 
 #include "compiler.h"
 
-#ifdef XFree86LOADER
 #include "loaderProcs.h"
-#endif
 #ifdef XFreeXDGA
 #include "dgaproc.h"
 #endif
@@ -114,12 +112,10 @@ extern void os2ServerVideoAccess();
 void (*xf86OSPMClose)(void) = NULL;
 #endif
 
-#ifdef XFree86LOADER
 static char *baseModules[] = {
 	"pcidata",
 	NULL
 };
-#endif
 
 /* Common pixmap formats */
 
@@ -272,10 +268,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 {
   int                    i, j, k, scr_index;
   static unsigned long   generation = 0;
-#ifdef XFree86LOADER
   char                   **modulelist;
   pointer                *optionlist;
-#endif
   screenLayoutPtr	 layout;
   Pix24Flags		 screenpix24, pix24;
   MessageType		 pix24From = X_DEFAULT;
@@ -333,7 +327,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
     if (!autoconfig)
 	PostConfigInit();
 
-#ifdef XFree86LOADER
     /* Initialise the loader */
     LoaderInit();
 
@@ -377,8 +370,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
     if (!xf86LoadModules(baseModules, NULL))
 	FatalError("Unable to load required base modules, Exiting...\n");
     
-#endif
-
     xf86OpenConsole();
 
     /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
@@ -401,7 +392,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
     /* Initialise the resource broker */
     xf86ResourceBrokerInit();
 
-#ifdef XFree86LOADER
     /* Load all modules specified explicitly in the config file */
     if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {
       xf86LoadModules(modulelist, optionlist);
@@ -432,7 +422,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
      * XXX Nothing keeps track of them for other modules.
      */
     /* XXX What do we do if not all of these could be loaded? */
-#endif
 
     /*
      * At this point, xf86DriverList[] is all filled in with entries for
@@ -672,12 +661,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
       exit(0);
     }
 
-#ifdef XFree86LOADER
     /* Remove (unload) drivers that are not required */
     for (i = 0; i < xf86NumDrivers; i++)
 	if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
 	    xf86DeleteDriver(i);
-#endif
 
     /*
      * At this stage we know how many screens there are.
@@ -982,12 +969,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 #endif
   }
 
-#ifdef XFree86LOADER
     if ((serverGeneration == 1) && LoaderCheckUnresolved(LD_RESOLV_IFDONE)) {
 	/* For now, just a warning */
 	xf86Msg(X_WARNING, "Some symbols could not be resolved!\n");
     }
-#endif
 
   xf86PostScreenInit();
 
@@ -1167,9 +1152,7 @@ OsVendorInit()
   signal(SIGCHLD, SIG_DFL);	/* Need to wait for child processes */
 #endif
   OsDelayInitColors = TRUE;
-#ifdef XFree86LOADER
   loadableFonts = TRUE;
-#endif
 
   if (!beenHere)
     xf86LogInit();
@@ -1461,9 +1444,7 @@ ddxProcessArgument(int argc, char **argv, int i)
   }
   if (!strcmp(argv[i],"-ignoreABI"))
   {
-#ifdef XFree86LOADER
     LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
-#endif
     return 1;
   }
   if (!strcmp(argv[i],"-verbose"))
@@ -1870,9 +1851,7 @@ xf86PrintBanner()
 #endif
   ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
 	 "\tto make sure that you have the latest version.\n");
-#ifdef XFree86LOADER
   ErrorF("Module Loader present\n");
-#endif
 }
 
 static void
@@ -1919,7 +1898,6 @@ xf86RunVtInit(void)
     }
 }
 
-#ifdef XFree86LOADER
 /*
  * xf86LoadModules iterates over a list that is being passed in.
  */             
@@ -1962,8 +1940,6 @@ xf86LoadModules(char **list, pointer *optlist)
     return !failed;
 }
 
-#endif
-
 /* Pixmap format stuff */
 
 _X_EXPORT PixmapFormatPtr

hw/xfree86/common/xf86MiscExt.c

@@ -459,12 +459,10 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd)
 	mseParamsPtr mse = structure;
 	InputInfoPtr pInfo;
 	MouseDevPtr pMse;
-#ifdef XFree86LOADER
 	pointer xf86MouseProtocolIDToName
 	    = LoaderSymbol("xf86MouseProtocolIDToName");
 	if (!xf86MouseProtocolIDToName)
 	    return MISC_RET_NOMODULE;
-#endif
 	if (mse->type < MTYPE_MICROSOFT
 		|| ( mse->type > MTYPE_EXPPS2
 		    && (mse->type!=MTYPE_OSMOUSE && mse->type!=MTYPE_XQUEUE)))
@@ -563,12 +561,8 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd)
 	pMse->chordMiddle     = mse->chordmiddle;
 	pMse->mouseFlags      = mse->flags;
 
-#ifdef XFree86LOADER
 	pMse->protocol = ((const char *(*)(MouseProtocolID))
 			  xf86MouseProtocolIDToName)(pMse->protocolID);
-#else
-	pMse->protocol = xf86MouseProtocolIDToName(pMse->protocolID);
-#endif
 	
 	if (mse->device) {
 	    if (MiscExtAuthorizeDevice(pInfo, mse->device)) {

hw/xfree86/common/xf86Priv.h

@@ -95,13 +95,9 @@ extern unsigned short xf86MouseCflags[];
 extern Bool xf86SupportedMouseTypes[];
 extern int xf86NumMouseTypes;
 
-#ifdef XFree86LOADER
 extern DriverPtr *xf86DriverList;
 extern ModuleInfoPtr *xf86ModuleInfoList;
 extern int xf86NumModuleInfos;
-#else
-extern DriverPtr xf86DriverList[];
-#endif
 extern int xf86NumDrivers;
 extern Bool xf86Resetting;
 extern Bool xf86Initialising;

hw/xfree86/common/xf86pciBus.c

@@ -1690,19 +1690,12 @@ xf86PciProbe(void)
     /*
      * Initialise the pcidata entry points.
      */
-#ifdef XFree86LOADER
     xf86SetupPciIds = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
     xf86ClosePciIds = (ScanPciCloseProcPtr)LoaderSymbol("ScanPciClosePciIds");
     xf86FindPciNamesByDevice =
 	(ScanPciFindByDeviceProcPtr)LoaderSymbol("ScanPciFindPciNamesByDevice");
     xf86FindPciNamesBySubsys =
 	(ScanPciFindBySubsysProcPtr)LoaderSymbol("ScanPciFindPciNamesBySubsys");
-#else
-    xf86SetupPciIds = ScanPciSetupPciIds;
-    xf86ClosePciIds = ScanPciClosePciIds;
-    xf86FindPciNamesByDevice = ScanPciFindPciNamesByDevice;
-    xf86FindPciNamesBySubsys = ScanPciFindPciNamesBySubsys;
-#endif
 
     if (!xf86SetupPciIds())
 	FatalError("xf86SetupPciIds() failed\n");

hw/xfree86/common/xf86str.h

@@ -319,7 +319,6 @@ typedef struct _DriverRec {
 #define HaveDriverFuncs 1
 
 
-#ifdef XFree86LOADER
 /*
  * The optional module list struct. This allows modules exporting helping
  * functions to configuration tools, the Xserver, or any other
@@ -333,7 +332,6 @@ typedef struct _ModuleInfoRec {
     const OptionInfoRec * (*AvailableOptions)(void *unused);
     pointer		unused[8];	/* leave some space for more fields */
 } ModuleInfoRec, *ModuleInfoPtr;
-#endif
 
 /*
  * These are the private bus types.  New types can be added here.  Types

hw/xfree86/common/xf86xv.c

@@ -53,9 +53,7 @@
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
-#ifdef XFree86LOADER
 #include "xvmodproc.h"
-#endif
 
 #include "xf86xvpriv.h"
 
@@ -118,16 +116,9 @@ int XF86XvScreenIndex = -1;
 static unsigned long XF86XVGeneration = 0;
 static unsigned long PortResource = 0;
 
-#ifdef XFree86LOADER
 int (*XvGetScreenIndexProc)(void) = NULL;
 unsigned long (*XvGetRTPortProc)(void) = NULL;
 int (*XvScreenInitProc)(ScreenPtr) = NULL;
-#else
-int (*XvGetScreenIndexProc)(void) = XvGetScreenIndex;
-unsigned long (*XvGetRTPortProc)(void) = XvGetRTPort;
-int (*XvScreenInitProc)(ScreenPtr) = XvScreenInit;
-#endif
-
 
 #define GET_XV_SCREEN(pScreen) \
 	((XvScreenPtr)((pScreen)->devPrivates[XF86XvScreenIndex].ptr))

hw/xfree86/common/xf86xvmc.c

@@ -41,19 +41,13 @@
 #include "resource.h"
 #include "dixstruct.h"
 
-#ifdef XFree86LOADER
 #include "xvmodproc.h"
-#endif
 
 #include "xf86xvpriv.h"
 #include "xf86xvmc.h"
 
 typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr);
-#ifdef XFree86LOADER
 _X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL;
-#else
-_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = XvMCScreenInit;
-#endif
 
 
 typedef struct {

hw/xfree86/ddc/Makefile.am

@@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
 
 EXTRA_DIST = ddcPriv.h DDC.HOWTO

hw/xfree86/ddc/xf86DDC.c

@@ -121,14 +121,12 @@ static const OptionInfoRec DDCOptions[] = {
     { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
 };
 
-#ifdef XFree86LOADER
 /*ARGSUSED*/
 static const OptionInfoRec *
 DDCAvailableOptions(void *unused)
 {
     return (DDCOptions);
 }
-#endif
 
 /**
  * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are

hw/xfree86/dixmods/Makefile.am

@@ -31,7 +31,7 @@ fontsmoduledir = $(moduledir)/fonts
 fontsmodule_LTLIBRARIES = libfreetype.la \
                           libtype1.la
 
-AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
 INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/afb \
            -I$(top_srcdir)/cfb \
@@ -64,6 +64,7 @@ libdbe_la_SOURCES = dbemodule.c
 libfb_la_LDFLAGS = -avoid-version
 libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
 libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
+libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
 
 libglx_la_LDFLAGS = -avoid-version
 if AIGLX
@@ -93,6 +94,7 @@ libtype1_la_LDFLAGS = -avoid-version
 libtype1_la_SOURCES = type1mod.c
 
 libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
+libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
 
 libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
 libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la

hw/xfree86/dixmods/extmod/Makefile.am

@@ -11,7 +11,7 @@ if XV
 XV_SRCS = xvmod.c xvmodproc.h
 endif
 
-AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = @XORG_CFLAGS@
 INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/afb \
            -I$(top_srcdir)/mfb \

hw/xfree86/doc/sgml/DESIGN.sgml

@@ -6436,7 +6436,6 @@ static PciChipsets ZZZPciChipsets[] = {
     driver.  This is required for the dynamically loaded version:
 <p>
     <code>
-#ifdef XFree86LOADER
 static XF86ModuleVersionInfo zzzVersRec =
 {
     "zzz",
@@ -6450,7 +6449,6 @@ static XF86ModuleVersionInfo zzzVersRec =
     MOD_CLASS_VIDEODRV,
     {0,0,0,0}
 };
-#endif
     </code>
 <p>
   <item>Define a data structure to hold the driver's screen-specific data.
@@ -6508,9 +6506,7 @@ static const OptionInfoRec ZZZOptions[] = {
     the driver to the main list of drivers.
 
     <code>
-#ifdef XFree86LOADER
+static MODULESETUPPROTO(zzzSetup);
-
-static MODULESETUPPROTO(mgaSetup);
 
 XF86ModuleData zzzModuleData = { &amp;zzzVersRec, zzzSetup, NULL };
 
@@ -6540,7 +6536,6 @@ zzzSetup(pointer module, pointer opts, int *errmaj, int *errmin)
         return NULL;
     }
 }
-#endif
     </code>
 
 <sect2>GetRec, FreeRec

hw/xfree86/dri/Makefile.am

@@ -7,9 +7,9 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
                    -I$(top_builddir)/GL/include \
 		   -I@MESA_SOURCE@/include \
                    -DHAVE_XORG_CONFIG_H \
-		   @SERVER_DEFINES@ \
+		 \
-		   @MODULE_DEFINES@ \
+		 \
-                   @LOADER_DEFINES@ \
+ \
                    @DRIPROTO_CFLAGS@ \
                    @LIBDRM_CFLAGS@ \
                    @GL_CFLAGS@

hw/xfree86/dri/dri.c

@@ -69,7 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "mi.h"
 #include "mipointer.h"
 
-#if defined(XFree86LOADER) && !defined(PANORAMIX)
+#if !defined(PANORAMIX)
 extern Bool noPanoramiXExtension;
 #endif
 
@@ -135,14 +135,9 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
      * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
      * anyway.
      */
-#if defined(PANORAMIX) && !defined(XFree86LOADER)
-    xineramaInCore = TRUE;
-#elif defined(XFree86LOADER)
     if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
 	xineramaInCore = TRUE;
-#endif
 
-#if defined(PANORAMIX) || defined(XFree86LOADER)
     if (xineramaInCore) {
 	if (!noPanoramiXExtension) {
 	    DRIDrvMsg(pScreen->myNum, X_WARNING,
@@ -150,7 +145,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 	    return FALSE;
 	}
     }
-#endif
 
     drmWasAvailable = drmAvailable();
 

hw/xfree86/dummylib/Makefile.am

@@ -6,7 +6,7 @@ noinst_LIBRARIES = libdummy.a libdummy-nonserver.a
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
 
 if NEED_STRLCAT
 STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c

hw/xfree86/exa/Makefile.am

@@ -7,7 +7,7 @@ INCLUDES = \
 	-I$(srcdir)/../../../exa \
 	-I$(srcdir)/../../../miext/cw
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
 
 libexa_la_SOURCES = \
 	examodule.c

hw/xfree86/fbdevhw/Makefile.am

@@ -11,7 +11,7 @@ endif
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
 
 sdk_HEADERS = fbdevhw.h
 

hw/xfree86/i2c/Makefile.am

@@ -15,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
 
 sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h
 

hw/xfree86/i2c/bt829.h

@@ -82,8 +82,6 @@ int bt829_SetCC(BT829Ptr bt);
 		"bt829_SetOUT_EN", \
 		"bt829_SetP_IO"
 
-#ifdef XFree86LOADER
-
 #define xf86_bt829_Detect		((BT829Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("bt829_Detect"))
 #define xf86_bt829_ATIInit		((int (*)(BT829Ptr))LoaderSymbol("bt829_ATIInit"))
 #define xf86_bt829_SetFormat		((int (*)(BT829Ptr, CARD8))LoaderSymbol("bt829_SetFormat"))
@@ -96,20 +94,4 @@ int bt829_SetCC(BT829Ptr bt);
 #define xf86_bt829_SetOUT_EN		((void (*)(BT829Ptr, Bool))LoaderSymbol("bt829_SetOUT_EN"))
 #define xf86_bt829_SetP_IO		((void (*)(BT829Ptr, CARD8))LoaderSymbol("bt829_SetP_IO"))
 
-#else
-
-#define xf86_bt829_Detect		bt829_Detect
-#define xf86_bt829_ATIInit		bt829_ATIInit
-#define xf86_bt829_SetFormat		bt829_SetFormat
-#define xf86_bt829_SetMux		bt829_SetMux
-#define xf86_bt829_SetCaptSize		bt829_SetCaptSize
-#define xf86_bt829_SetBrightness	bt829_SetBrightness
-#define xf86_bt829_SetContrast		bt829_SetContrast
-#define xf86_bt829_SetSaturation	bt829_SetSaturation
-#define xf86_bt829_SetTint		bt829_SetTint
-#define xf86_bt829_SetOUT_EN		bt829_SetOUT_EN
-#define xf86_bt829_SetP_IO		bt829_SetP_IO
-
-#endif
-
 #endif

hw/xfree86/i2c/fi1236.h

@@ -100,8 +100,6 @@ void fi1236_dump_status(FI1236Ptr f);
 		"FI1236_set_tuner_type", \
 		"TUNER_set_frequency"
 
-#ifdef XFree86LOADER
-
 #define xf86_Detect_FI1236         ((FI1236Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_FI1236"))
 #define xf86_FI1236_set_tuner_type ((void (*)(FI1236Ptr, int))LoaderSymbol("FI1236_set_tuner_type"))
 #define xf86_TUNER_set_frequency           ((void (*)(FI1236Ptr, CARD32))LoaderSymbol("TUNER_set_frequency"))
@@ -109,15 +107,4 @@ void fi1236_dump_status(FI1236Ptr f);
 #define xf86_TUNER_get_afc_hint   ((int (*)(FI1236Ptr))LoaderSymbol("TUNER_get_afc_hint"))
 #define xf86_fi1236_dump_status   ((void (*)(FI1236Ptr))LoaderSymbol("fi1236_dump_status"))
 
-#else
-
-#define xf86_Detect_FI1236         Detect_FI1236
-#define xf86_FI1236_set_tuner_type FI1236_set_tuner_type
-#define xf86_TUNER_set_frequency   TUNER_set_frequency
-#define xf86_FI1236_AFC            FI1236_AFC
-#define xf86_TUNER_get_afc_hint    TUNER_get_afc_hint
-#define xf86_fi1236_dump_status    fi1236_dump_status
-
-#endif
-
 #endif

hw/xfree86/i2c/i2c_def.h

@@ -3,8 +3,6 @@
 
 /* the following are a workaround for possible loader bug.. 
    WATCH function types ! */
-#if XFree86LOADER
-
 #define CreateI2CBusRec    ((pointer (*)(void))LoaderSymbol("xf86CreateI2CBusRec"))
 #define DestroyI2CBusRec   ((pointer (*)(I2CBusPtr, Bool, Bool))LoaderSymbol("xf86DestroyI2CBusRec"))
 #define I2CBusInit         ((Bool (*)(pointer))LoaderSymbol("xf86I2CBusInit"))
@@ -13,17 +11,4 @@
 #define I2CDevInit         ((Bool (*)(I2CDevPtr))LoaderSymbol("xf86I2CDevInit"))
 #define I2CProbeAddress    ((Bool (*)(I2CBusPtr,I2CSlaveAddr))LoaderSymbol("xf86I2CProbeAddress"))
 
-#else
-
-#define CreateI2CBusRec    xf86CreateI2CBusRec
-#define DestroyI2CBusRec   xf86DestroyI2CBusRec
-#define I2CBusInit         xf86I2CBusInit
-#define I2C_WriteRead      xf86I2CWriteRead
-#define CreateI2CDevRec    xf86CreateI2CDevRec
-#define I2CDevInit         xf86I2CDevInit 
-#define I2CProbeAddress    xf86I2CProbeAddress
-
-#endif
-
-
 #endif

hw/xfree86/i2c/msp3430.h

@@ -105,22 +105,10 @@ void MSP3430SetSAP (MSP3430Ptr m, int mode);
 		"MSP3430SetVolume", \
 		"MSP3430SetSAP"
 
-#ifdef XFree86LOADER
-
 #define xf86_DetectMSP3430     ((MSP3430Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("DetectMSP3430"))
 #define xf86_ResetMSP3430      ((void (*)(MSP3430Ptr))LoaderSymbol("ResetMSP3430"))
 #define xf86_MSP3430SetVolume  ((void (*)(MSP3430Ptr, CARD8))LoaderSymbol("MSP3430SetVolume"))
 #define xf86_MSP3430SetSAP     ((void (*)(MSP3430Ptr, int))LoaderSymbol("MSP3430SetSAP"))
 #define xf86_InitMSP3430       ((void (*)(MSP3430Ptr))LoaderSymbol("InitMSP3430"))
 
-#else
-
-#define xf86_DetectMSP3430     DetectMSP3430
-#define xf86_ResetMSP3430      ResetMSP3430
-#define xf86_MSP3430SetVolume  MSP3430SetVolume
-#define xf86_MSP3430SetSAP     MSP3430SetSAP
-#define xf86_InitMSP3430       InitMSP3430
-
-#endif
-
 #endif

hw/xfree86/i2c/tda8425.h

@@ -34,20 +34,9 @@ void tda8425_mute(TDA8425Ptr t, Bool mute);
 		"tda8425_setaudio", \
 		"tda8425_mute"
 
-#ifdef XFree86LOADER
-
 #define xf86_Detect_tda8425   ((TDA8425Ptr (*)(I2CBusPtr, I2CSlaveAddr,Bool))LoaderSymbol("Detect_tda8425"))
 #define xf86_tda8425_init     ((Bool (*)(TDA8425Ptr))LoaderSymbol("tda8425_init"))
 #define xf86_tda8425_setaudio ((void (*)(TDA8425Ptr))LoaderSymbol("tda8425_setaudio"))
 #define xf86_tda8425_mute     ((void (*)(TDA8425Ptr, Bool))LoaderSymbol("tda8425_mute"))
 
-#else
-
-#define xf86_Detect_tda8425   Detect_tda8425
-#define xf86_tda8425_init     tda8425_init
-#define xf86_tda8425_setaudio tda8425_setaudio
-#define xf86_tda8425_mute     tda8425_mute
-
-#endif
-
 #endif

hw/xfree86/i2c/tda9850.h

@@ -29,8 +29,6 @@ CARD16 tda9850_getstatus(TDA9850Ptr t);
 		"tda9850_mute", \
 		"tda9850_sap_mute"
 
-#ifdef XFree86LOADER
-
 #define xf86_Detect_tda9850       ((TDA9850Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9850"))
 #define xf86_tda9850_init         ((Bool (*)(TDA9850Ptr))LoaderSymbol("tda9850_init"))
 #define xf86_tda9850_setaudio     ((void (*)(TDA9850Ptr))LoaderSymbol("tda9850_setaudio"))
@@ -38,15 +36,4 @@ CARD16 tda9850_getstatus(TDA9850Ptr t);
 #define xf86_tda9850_sap_mute     ((void (*)(TDA9850Ptr, Bool))LoaderSymbol("tda9850_sap_mute"))
 #define xf86_tda9850_getstatus    ((CARD16 (*)(TDA9850Ptr))LoaderSymbol("tda9850_getstatus"))
 
-#else
-
-#define xf86_Detect_tda9850       Detect_tda9850
-#define xf86_tda9850_init         tda9850_init
-#define xf86_tda9850_setaudio     tda9850_setaudio
-#define xf86_tda9850_mute         tda9850_mute
-#define xf86_tda9850_sap_mute     tda9850_sap_mute
-#define xf86_tda9850_getstatus    tda9850_getstatus
-
-#endif
-
 #endif

hw/xfree86/i2c/tda9885.h

@@ -51,22 +51,10 @@ void tda9885_dumpstatus(TDA9885Ptr t);
 		"tda9885_setaudio", \
 		"tda9885_mute"
 
-#ifdef XFree86LOADER
-
 #define xf86_Detect_tda9885       ((TDA9885Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9885"))
 #define xf86_tda9885_init         ((Bool (*)(TDA9885Ptr))LoaderSymbol("tda9885_init"))
 #define xf86_tda9885_setparameters     ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_setparameters"))
 #define xf86_tda9885_getstatus    ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_getstatus"))
 #define xf86_tda9885_dumpstatus    ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_dumpstatus"))
 
-#else
-
-#define xf86_Detect_tda9885       Detect_tda9885
-#define xf86_tda9885_init         tda9885_init
-#define xf86_tda9885_setparameters     tda9885_setparameters
-#define xf86_tda9885_getstatus    tda9885_getstatus
-#define xf86_tda9885_dumpstatus    tda9885_dumpstatus
-
-#endif
-
 #endif

hw/xfree86/i2c/uda1380.h

@@ -66,8 +66,6 @@ void uda1380_dumpstatus(UDA1380Ptr t);
 		"uda1380_getstatus", \
 		"uda1380_dumpstatus"
 
-#ifdef XFree86LOADER
-
 #define xf86_Detect_uda1380       ((UDA1380Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_uda1380"))
 #define xf86_uda1380_init         ((Bool (*)(UDA1380Ptr))LoaderSymbol("uda1380_init"))
 #define xf86_uda1380_shutdown     ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_shutdown"))
@@ -77,17 +75,4 @@ void uda1380_dumpstatus(UDA1380Ptr t);
 #define xf86_uda1380_getstatus    ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_getstatus"))
 #define xf86_uda1380_dumpstatus    ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_dumpstatus"))
 
-#else
-
-#define xf86_Detect_uda1380       Detect_uda1380
-#define xf86_uda1380_init         uda1380_init
-#define xf86_uda1380_shutdown         uda1380_shutdown
-#define xf86_uda1380_setvolume    uda1380_setvolume
-#define xf86_uda1380_mute         uda1380_mute
-#define xf86_uda1380_setparameters     uda1380_setparameters
-#define xf86_uda1380_getstatus    uda1380_getstatus
-#define xf86_uda1380_dumpstatus    uda1380_dumpstatus
-
-#endif
-
 #endif

hw/xfree86/int10/Makefile.am

@@ -2,7 +2,7 @@ module_LTLIBRARIES = libint10.la
 
 sdk_HEADERS = xf86int10.h
 
-EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+EXTRA_CFLAGS =
 
 libint10_la_LDFLAGS = -avoid-version
 

hw/xfree86/loader/Makefile.am

@@ -5,7 +5,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \
 	   -I$(srcdir)/../ddc -I$(srcdir)/../i2c
 
 #AM_LDFLAGS = -r
-AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS)
 
 if XORG_LOADER_SPARC
 SPARC_SOURCES = SparcMulDiv.S

hw/xfree86/os-support/bsd/Makefile.am

@@ -50,7 +50,7 @@ ARCH_SOURCES = \
 endif
 
 # FIXME: NetBSD Aperture defines (configure.ac)
-AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS)
 
 INCLUDES = $(XORG_INCS)
 

hw/xfree86/os-support/bsd/bsd_jstk.c

@@ -36,9 +36,7 @@
 #include <machine/joystick.h>
 #include <fcntl.h>
 
-#ifdef XFree86LOADER
 #include "misc.h"
-#endif
 #include "xf86.h"
 
 #define JS_RETURN sizeof(struct joystick)
@@ -174,7 +172,6 @@ xf86JoystickGetState(int fd, int *x, int *y, int *buttons)
   return 1;
 }
 
-#ifdef XFree86LOADER
 /*
  * Entry point for XFree86 Loader
  */
@@ -184,5 +181,4 @@ bsd_jstkModuleInit(pointer *data, INT32 *magic)
     *magic = MAGIC_DONE;
     *data = NULL;
 }
-#endif
 /* end of bsd_jstk.c */

hw/xfree86/os-support/bus/Makefile.am

@@ -53,6 +53,6 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
 
 EXTRA_DIST = $(sdk_HEADERS)

hw/xfree86/os-support/drm/Makefile.am

@@ -7,9 +7,8 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
                    -I$(top_srcdir)/GL/glx \
                    -I$(top_srcdir)/GL/include \
                    -DHAVE_XORG_CONFIG_H \
-                   @LIBDRM_CFLAGS@ \
+                   @LIBDRM_CFLAGS@
-                   @SERVER_DEFINES@ \
+
-                   @LOADER_DEFINES@
 libdrm_la_LDFLAGS = -module -avoid-version
 libdrm_ladir = $(moduledir)/@XORG_OS@
 libdrm_la_SOURCES = \

hw/xfree86/os-support/drm/xf86drm.c

@@ -37,18 +37,10 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86Server
+#include "xf86.h"
-# include "xf86.h"
+#include "xf86_OSproc.h"
-# include "xf86_OSproc.h"
+#define _DRM_MALLOC xalloc
-# define _DRM_MALLOC xalloc
+#define _DRM_FREE   xfree
-# define _DRM_FREE   xfree
-# ifndef XFree86LOADER
-#  include <sys/mman.h>
-# endif
-#else
-# define _DRM_MALLOC malloc
-# define _DRM_FREE   free
-#endif
 
 #include "drm.h"
 #include <stdio.h>
@@ -124,19 +116,9 @@ drmMsg(const char *format, ...)
 {
     va_list	ap;
 
-#ifndef XFree86Server
+    va_start(ap, format);
-    const char *env;
+    xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);
-    if ((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose"))
+    va_end(ap);
-#endif
-    {
-	va_start(ap, format);
-#ifdef XFree86Server
-	xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);
-#else
-	vfprintf(stderr, format, ap);
-#endif
-	va_end(ap);
-    }
 }
 
 static void *drmHashTable = NULL; /* Context switch callbacks */
@@ -270,19 +252,15 @@ static int drmOpenDevice(long dev, int minor)
     int             fd;
     mode_t          devmode = DRM_DEV_MODE;
     int             isroot  = !geteuid();
-#if defined(XFree86Server)
     uid_t           user    = DRM_DEV_UID;
     gid_t           group   = DRM_DEV_GID;
-#endif
 
     sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor);
     drmMsg("drmOpenDevice: node name is %s\n", buf);
 
-#if defined(XFree86Server)
     devmode  = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE;
     devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
     group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID;
-#endif
 
     if (stat(DRM_DIR_NAME, &st)) {
 	if (!isroot) return DRM_ERR_NOT_ROOT;
@@ -297,10 +275,8 @@ static int drmOpenDevice(long dev, int minor)
 	remove(buf);
 	mknod(buf, S_IFCHR | devmode, dev);
     }
-#if defined(XFree86Server)
     chown(buf, user, group);
     chmod(buf, devmode);
-#endif
 
     fd = open(buf, O_RDWR, 0);
     drmMsg("drmOpenDevice: open result is %d, (%s)\n",
@@ -314,10 +290,8 @@ static int drmOpenDevice(long dev, int minor)
 	if (!isroot) return DRM_ERR_NOT_ROOT;
 	remove(buf);
 	mknod(buf, S_IFCHR | devmode, dev);
-#if defined(XFree86Server)
 	chown(buf, user, group);
 	chmod(buf, devmode);
-#endif
     }
     fd = open(buf, O_RDWR, 0);
     drmMsg("drmOpenDevice: open result is %d, (%s)\n",
@@ -454,16 +428,12 @@ static int drmOpenByName(const char *name)
     char *        id;
     
     if (!drmAvailable()) {
-#if !defined(XFree86Server)
-	return -1;
-#else
         /* try to load the kernel module now */
         if (!xf86LoadKernelModule(name)) {
             ErrorF("[drm] failed to load kernel module \"%s\"\n",
 		   name);
             return -1;
         }
-#endif
     }
 
     /*
@@ -546,7 +516,6 @@ static int drmOpenByName(const char *name)
  */
 int drmOpen(const char *name, const char *busid)
 {
-#ifdef XFree86Server
     if (!drmAvailable() && name != NULL) {
 	/* try to load the kernel */
 	if (!xf86LoadKernelModule(name)) {
@@ -555,7 +524,6 @@ int drmOpen(const char *name, const char *busid)
 	    return -1;
 	}
     }
-#endif
 
     if (busid) {
 	int fd;
@@ -2259,7 +2227,6 @@ int drmCommandWriteRead(int fd, unsigned long drmCommandIndex,
     return 0;
 }
 
-#if defined(XFree86Server) 
 static void drmSIGIOHandler(int interrupt, void *closure)
 {
     unsigned long key;
@@ -2323,4 +2290,3 @@ int drmRemoveSIGIOHandler(int fd)
 
     return xf86RemoveSIGIOHandler(fd);
 }
-#endif

hw/xfree86/os-support/drm/xf86drmHash.c

@@ -81,9 +81,7 @@
 #if !HASH_MAIN
 # include "drm.h"
 # include "xf86drm.h"
-# ifdef XFree86LOADER
+# include "xf86.h"
-#  include "xf86.h"
-# endif
 #endif
 
 #define N(x)  drm##x

hw/xfree86/os-support/drm/xf86drmRandom.c

@@ -84,9 +84,7 @@
 #if !RANDOM_MAIN
 # include "drm.h"
 # include "xf86drm.h"
-# ifdef XFree86LOADER
+# include "xf86.h"
-#  include "xf86.h"
-# endif
 #endif
 
 #define N(x)  drm##x

hw/xfree86/os-support/drm/xf86drmSL.c

@@ -53,12 +53,7 @@
 #else
 # include "drm.h"
 # include "xf86drm.h"
-# ifdef XFree86LOADER
+# include "xf86.h"
-#  include "xf86.h"
-# else
-#  include <stdio.h>
-#  include <stdlib.h>
-# endif
 #endif
 
 #define N(x)  drm##x

hw/xfree86/os-support/linux/Makefile.am

@@ -34,7 +34,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
                      $(APM_SOURCES) \
                      $(PLATFORM_PCI_SUPPORT)
 
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
 
 INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
 

hw/xfree86/os-support/linux/int10/linux.c

@@ -18,12 +18,6 @@
 #else
 #define DEV_MEM "/dev/mem"
 #endif
-#ifndef XFree86LOADER
-#include <sys/mman.h>
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *)-1)
-#endif
-#endif
 #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
 #define SHMERRORPTR (pointer)(-1)
 

hw/xfree86/os-support/linux/lnx_jstk.c

@@ -40,9 +40,7 @@ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Ex
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#ifdef XFree86LOADER
 #include "xf86.h"
-#endif
 
 #if !defined(JSIOCGTIMELIMIT)
 /* make 2.1.x joystick.h backward compatable */
@@ -172,7 +170,6 @@ xf86JoystickGetState(int fd, int *x, int *y, int *buttons)
   return 1;
 }
 
-#ifdef XFree86LOADER
 /*
  * Entry point for XFree86 Loader
  */
@@ -182,6 +179,5 @@ linux_jstkModuleInit(pointer *data, INT32 *magic)
     *magic = MAGIC_DONE;
     *data = NULL;
 }
-#endif
 
 /* end of lnx_jstk.c */

hw/xfree86/os-support/misc/Makefile.am

@@ -18,6 +18,6 @@ libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES)
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
 
 EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES)

hw/xfree86/os-support/shared/sigio.c

@@ -58,22 +58,11 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86Server
 # include <X11/X.h>
 # include "xf86.h"
 # include "xf86Priv.h"
 # include "xf86_OSlib.h"
 # include "inputstr.h"
-#else
-# include <unistd.h>
-# include <signal.h>
-# include <fcntl.h>
-# include <sys/time.h>
-# include <errno.h>
-# include <stdio.h>
-# include <string.h>
-# define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
-#endif
 
 /*
  * Linux libc5 defines FASYNC, but not O_ASYNC.  Don't know if it is
@@ -126,11 +115,9 @@ xf86SIGIO (int sig)
 				   xf86SigIOFuncs[i].closure);
 	    r--;
 	}
-#ifdef XFree86Server
     if (r > 0) {
       xf86Msg(X_ERROR, "SIGIO %d descriptors not handled\n", r);
     }
-#endif
 }
 
 static int
@@ -159,24 +146,14 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)
 		return 0;
 	    blocked = xf86BlockSIGIO();
 	    if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) {
-#ifdef XFree86Server
 		xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n", 
 			fd, strerror(errno));
-#else
-		fprintf(stderr,"fcntl(%d, O_ASYNC): %s\n", 
-			fd, strerror(errno));
-#endif
 		xf86UnblockSIGIO(blocked);
 		return 0;
 	    }
 	    if (fcntl(fd, F_SETOWN, getpid()) == -1) {
-#ifdef XFree86Server
 		xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n", 
 			fd, strerror(errno));
-#else
-		fprintf(stderr,"fcntl(%d, F_SETOWN): %s\n", 
-			fd, strerror(errno));
-#endif
 		xf86UnblockSIGIO(blocked);
 		return 0;
 	    }
@@ -289,7 +266,6 @@ xf86UnblockSIGIO (int wasset)
     }
 }
 
-#ifdef XFree86Server
 void
 xf86AssertBlockedSIGIO (char *where)
 {
@@ -308,5 +284,3 @@ xf86SIGIOSupported (void)
 {
     return 1;
 }
-
-#endif

hw/xfree86/os-support/shared/sigiostubs.c

@@ -31,7 +31,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86Server
 #ifdef __UNIXOS2__
 # define I_NEED_OS2_H
 #endif
@@ -39,13 +38,6 @@
 # include "xf86.h"
 # include "xf86Priv.h"
 # include "xf86_OSlib.h"
-#else
-# include <unistd.h>
-# include <signal.h>
-# include <fcntl.h>
-# include <sys/time.h>
-# include <errno.h>
-#endif
 
 _X_EXPORT int
 xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)
@@ -70,12 +62,10 @@ xf86UnblockSIGIO (int wasset)
 {
 }
 
-#ifdef XFree86Server
 void
 xf86AssertBlockedSIGIO (char *where)
 {
 }
-#endif
 
 /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */
 Bool

hw/xfree86/os-support/solaris/Makefile.am

@@ -34,7 +34,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
 sdk_HEADERS = agpgart.h
 nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
 
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
 
 INCLUDES = $(XORG_INCS) 
 

hw/xfree86/os-support/xf86_OSproc.h

@@ -212,9 +212,7 @@ extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
 extern int xf86RemoveSIGIOHandler(int fd);
 extern int xf86BlockSIGIO (void);
 extern void xf86UnblockSIGIO (int);
-#ifdef XFree86Server
 extern void xf86AssertBlockedSIGIO (char *);
-#endif
 extern Bool xf86SIGIOSupported (void);
 
 #ifdef XF86_OS_PRIVS

hw/xfree86/os-support/xf86_ansic.h

@@ -28,33 +28,27 @@
 
 /* Handle <stdarg.h> */
 
-#ifndef IN_MODULE
+#ifndef __OS2ELF__
 # include <stdarg.h>
-#else /* !IN_MODULE */
+#else /* __OS2ELF__ */
-# ifndef __OS2ELF__
+  /* EMX/gcc_elf under OS/2 does not have native header files */
-#  include <stdarg.h>
+# if !defined (_VA_LIST)
-# else /* __OS2ELF__ */
+#  define _VA_LIST
-   /* EMX/gcc_elf under OS/2 does not have native header files */
+   typedef char *va_list;
-#  if !defined (_VA_LIST)
+# endif
-#   define _VA_LIST
+# define _VA_ROUND(t) ((sizeof (t) + 3) & -4)
-    typedef char *va_list;
+# if !defined (va_start)
-#  endif
+#  define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4)
-#  define _VA_ROUND(t) ((sizeof (t) + 3) & -4)
+#  define va_end(ap) (ap = 0, (void)0)
-#  if !defined (va_start)
+#  define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t)))
-#   define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4)
+# endif
-#   define va_end(ap) (ap = 0, (void)0)
+#endif /* __OS2ELF__ */
-#   define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t)))
-#  endif
-# endif /* __OS2ELF__ */
-#endif /* IN_MODULE */
 
 /*
  * The first set of definitions are required both for modules and
  * libc_wrapper.c.
  */
 
-#if defined(XFree86LOADER) || defined(NEED_XF86_TYPES)
-
 #if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || \
 	defined(__SCO__) || defined(__UNIXWARE__)
 #define HAVE_VSSCANF
@@ -133,9 +127,6 @@
 #define MAXLONG LONG_MAX
 #endif
 
-#endif /* XFree86LOADER || NEED_XF86_TYPES */
-
-#if defined(XFree86LOADER) || defined(NEED_XF86_PROTOTYPES)
 /*
  * ANSI C compilers only.
  */
@@ -321,21 +312,6 @@ extern void xf86longjmp(xf86jmp_buf env, int val);
 	(xf86getjmptype() == 1 ? xf86setjmp1((env), xf86setjmp1_arg2()) : \
 		xf86setjmperror((env))))
 
-#else /* XFree86LOADER || NEED_XF86_PROTOTYPES */
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <ctype.h>
-#ifdef HAVE_SYSV_IPC
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#endif
-#include <sys/stat.h>
-#define stat_t struct stat
-#endif /* XFree86LOADER || NEED_XF86_PROTOTYPES */
-
 /*
  * These things are always required by drivers (but not by libc_wrapper.c),
  * even for a static server because some OSs don't provide them.

hw/xfree86/os-support/xf86_libc.h

@@ -53,8 +53,6 @@
  * libc_wrapper.c.
  */
 
-#if defined(XFree86LOADER) || defined(NEED_XF86_TYPES)
-
 /*
  * First, the new data types
  *
@@ -215,14 +213,12 @@ typedef int xf86jmp_buf[1024];
 /* xf86shmclt() */
 #define XF86IPC_RMID 0
 
-#endif /* defined(XFree86LOADER) || defined(NEED_XF86_TYPES) */
-
 /*
  * the rest of this file should only be included for code that is supposed
  * to go into modules
  */
 
-#if defined(XFree86LOADER) && !defined(DONT_DEFINE_WRAPPERS)
+#if !defined(DONT_DEFINE_WRAPPERS)
 
 #undef abort
 #define abort()			xf86abort()
@@ -713,10 +709,9 @@ typedef int xf86jmp_buf[1024];
 # define _FILEDEFED /* Already have FILE defined, don't redefine it */
 #endif
 
-#endif /* XFree86LOADER  && !DONT_DEFINE_WRAPPERS */
+#endif /* !DONT_DEFINE_WRAPPERS */
 
-#if defined(XFree86LOADER) && \
+#if (!defined(DONT_DEFINE_WRAPPERS) || defined(DEFINE_SETJMP_WRAPPERS))
-    (!defined(DONT_DEFINE_WRAPPERS) || defined(DEFINE_SETJMP_WRAPPERS))
 #undef setjmp
 #define setjmp(a)               xf86setjmp_macro(a)
 #undef longjmp

hw/xfree86/rac/Makefile.am

@@ -5,4 +5,4 @@ sdk_HEADERS = xf86RAC.h
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)

hw/xfree86/ramdac/Makefile.am

@@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
 	CURSOR.NOTES
 
 AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
-            $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+            $(XORG_CFLAGS)
 INCLUDES = $(XORG_INCS)
 
 xf86BitOrder.c:

hw/xfree86/scanpci/Makefile.am

@@ -8,7 +8,7 @@ libscanpci_la_SOURCES = xf86ScanPci.c
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
 
 BUILT_SOURCES = xf86PciIds.h
 

hw/xfree86/shadowfb/Makefile.am

@@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)

hw/xfree86/utils/xorgcfg/Makefile.am

@@ -33,7 +33,7 @@ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser
 
 OPTIONSPATH=$(libdir)/X11
 
-xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \
+xorgcfg_CFLAGS = $(XORG_CFLAGS) $(CURSESDEFINES) \
 	$(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \
 	-DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\"
 xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \