Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework

Conflicts: hw/xfree86/common/xf86DoScanPci.c hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86pciBus.c
2006-07-21 15:25:35 -07:00 · 2006-07-21 15:25:35 -07:00 · 07ad92d2c4
commit 07ad92d2c4
parent 18624a9b7c 22db3fdb54
162 changed files with 385 additions and 1033 deletions
--- a/GL/glx/Makefile.am
+++ b/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@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	-DNO_LIBCWRAPPER \
 	@GLX_DEFINES@

--- a/GL/mesa/X/Makefile.am
+++ b/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@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@ \
 	-DXFree86Server

--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libac.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/glapi/Makefile.am
+++ b/GL/mesa/glapi/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libglapi.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libmain.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libmath.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@ -4,9 +4,7 @@ noinst_LTLIBRARIES = libshader.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/shader/grammar/Makefile.am
+++ b/GL/mesa/shader/grammar/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libgrammar.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libslang.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libswrast.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libss.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libtnl.la

 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
-	@SERVER_DEFINES@ \
-	@MODULE_DEFINES@ \
-	@LOADER_DEFINES@ \
+	-DXFree86Server \
 	@GLX_DEFINES@

 INCLUDES = -I@MESA_SOURCE@/include \
--- a/XTrap/Makefile.am
+++ b/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
--- a/Xext/Makefile.am
+++ b/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
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@ -59,7 +59,9 @@ of the copyright holder.

 #define NoSuchEvent 0x80000000

+#ifdef XKB
 extern Bool noXkbExtension;
+#endif
 extern int    xeviegrabState;

 static int		ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client);
@ -201,12 +203,14 @@ int ProcStart (register ClientPtr client)
           return BadAlloc;
    } else
        return BadAccess;
+#ifdef XKB
    if (!noXkbExtension) {
 	if (!XevieStart()) {
            DeleteCallback(&ClientStateCallback,XevieClientStateCallback,NULL);
            return BadAlloc;
        }
    }
+#endif
    
    xevieModifiersOn = FALSE;

@ -255,19 +259,23 @@ int ProcSend (register ClientPtr client)
 	case KeyPress:
        case KeyRelease:
 	  xevieKBEventSent = 1;
-          if(noXkbExtension)
-            CoreProcessKeyboardEvent (xE, xeviekb, 1);
-	  else 
+#ifdef XKB
+          if(!noXkbExtension)
 	    doSendEvent(xE, inputInfo.keyboard);
+	  else 
+#endif
+            CoreProcessKeyboardEvent (xE, xeviekb, 1);
 	  break;
 	case ButtonPress:
 	case ButtonRelease:
 	case MotionNotify:
 	  xevieEventSent = 1;
-	  if(noXkbExtension)
-	    CoreProcessPointerEvent(xE, xeviemouse, 1); 
-	  else
+#ifdef XKB
+	  if(!noXkbExtension)
 	    doSendEvent(xE, inputInfo.pointer);
+	  else
+#endif
+	    CoreProcessPointerEvent(xE, xeviemouse, 1); 
 	  break; 
 	default:
 	  break;
@ -464,6 +472,7 @@ XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count)
        xE->u.keyButtonPointer.state = keyc->state | inputInfo.pointer->button->state;
        /* fix bug: sequence lost in Xlib */
        xE->u.u.sequenceNumber = clients[xevieClientIndex]->sequence;
+#ifdef XKB
 	/* fix for bug5092586 */
 	if(!noXkbExtension) {
          switch(xE->u.u.type) {
@ -471,6 +480,7 @@ XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count)
 	    case KeyRelease: *kptr &= ~bit; break;
 	  }
 	}
+#endif
 	keycq[keycqHead].time = xE->u.keyButtonPointer.time;
 	memcpy(keycq[keycqHead].keyc, keyc, sizeof(KeyClassRec) - sizeof(KeyClassPtr));
 	memcpy(keycq[keycqHead].keyc->xkbInfo, keyc->xkbInfo, sizeof(XkbSrvInfoRec));
@ -525,6 +535,7 @@ XevieEnd(int clientIndex)
 {
    if (!clientIndex || clientIndex == xevieClientIndex) {

+#ifdef XKB
       if(!noXkbExtension) {

 	   XevieRemove(inputInfo.keyboard,NULL);
@ -540,6 +551,7 @@ XevieEnd(int clientIndex)
           inputInfo.pointer->public.realInputProc = CoreProcessPointerEvent;
           XkbSetExtension(inputInfo.pointer,ProcessPointerEvent);
       }
+#endif

       xevieFlag = 0;
       xevieClientIndex = 0;
--- a/Xi/Makefile.am
+++ b/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 \
--- a/afb/Makefile.am
+++ b/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

--- a/cfb/Makefile.am
+++ b/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

--- a/cfb32/Makefile.am
+++ b/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)
--- a/composite/Makefile.am
+++ b/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		\
--- a/configure.ac
+++ b/configure.ac
@ -469,7 +469,7 @@ AC_MSG_RESULT([$SETUID])
 AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"])

 dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
-dnl was not expanded, since libX11 with no transport types is rather useless.
+dnl was not expanded, since xorg-server with no transport types is rather useless.
 dnl
 dnl If you're seeing an error here, be sure you installed the lib/xtrans module
 dnl first and if it's not in the default location, that you set the ACLOCAL
@ -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])
@ -1247,11 +1242,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"
@ -1259,6 +1249,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])
@ -1596,10 +1587,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])

--- a/damageext/Makefile.am
+++ b/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		\
--- a/dbe/Makefile.am
+++ b/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
--- a/dix/Makefile.am
+++ b/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@"

--- a/dix/atom.c
+++ b/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"
--- a/dix/colormap.c
+++ b/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"
--- a/dix/events.c
+++ b/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)
--- a/exa/Makefile.am
+++ b/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 \
--- a/exa/exa.c
+++ b/exa/exa.c
@ -606,7 +606,9 @@ exaDriverInit (ScreenPtr		pScreen,
    }
 #endif

+#ifdef COMPOSITE
    miDisableCompositeWrapper(pScreen);
+#endif

    /*
     * Hookup offscreen pixmaps
--- 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
--- 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"

--- a/hw/darwin/quartz/xpr/dri.c
+++ b/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
--- a/hw/dmx/Makefile.am
+++ b/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) \
--- a/hw/dmx/config/Makefile.am
+++ b/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 \
--- a/hw/dmx/dmx-config.h
+++ b/hw/dmx/dmx-config.h
@ -93,6 +93,5 @@
 #undef DAMAGE
 #undef COMPOSITE
 #undef FONTCACHE
-#undef XFree86LOADER

 #endif /* DMX_CONFIG_H */
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@ -1046,14 +1046,3 @@ void ddxUseMsg(void)
    ErrorF("        Ctrl-Alt-q    Quit (core devices only)\n");
    ErrorF("        Ctrl-Alt-F*   Switch to VC (local only)\n");
 }
-
-#ifdef DDXTIME
-/** Return wall-clock time in milliseconds. */
-CARD32 GetTimeInMillis(void)
-{
-    struct timeval  tp;
-
-    gettimeofday(&tp, 0);
-    return tp.tv_sec * 1000 + tp.tv_usec / 1000;
-}
-#endif
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@ -31,8 +31,8 @@ libglxproxy_a_SOURCES = compsize.c \
                        renderpixswap.c \
                        unpack.h

-AM_CFLAGS = @SERVER_DEFINES@ \
-            @MODULE_DEFINES@ \
+AM_CFLAGS = \
+ \
            -I$(top_srcdir)/hw/dmx \
            -I$(top_srcdir)/include \
            -I$(top_srcdir)/GL/include \
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@ -59,7 +59,6 @@
 #include "glxutil.h"
 #include "glxext.h"
 #include "unpack.h"
-#include "GL/glx_ansic.h"

 #include "GL/glxproto.h"
 #include "glxvendor.h"
@ -158,7 +157,7 @@ static int CreateContext(__GLXclientState *cl,
    if (!glxc) {
 	return BadAlloc;
    }
-    __glXMemset(glxc, 0, sizeof(__GLXcontext));
+    memset(glxc, 0, sizeof(__GLXcontext));

    pScreen = screenInfo.screens[screen];
    pGlxScreen = &__glXActiveScreens[screen];
@ -610,7 +609,7 @@ static int AddCurrentContext(__GLXclientState *cl, __GLXcontext *glxc, DrawableP
    cl->currentContexts = table;
    cl->numCurrentContexts++;

-    __glXMemset(cl->be_currentCTag + num*screenInfo.numScreens, 0, 
+    memset(cl->be_currentCTag + num*screenInfo.numScreens, 0, 
 	         screenInfo.numScreens * sizeof(GLXContextTag));

    return num+1;
@ -2589,7 +2588,7 @@ int __glXClientInfo(__GLXclientState *cl, GLbyte *pc)
    cl->GLClientminorVersion = req->minor;
    if (cl->GLClientextensions) __glXFree(cl->GLClientextensions);
    buf = (const char *)(req+1);
-    cl->GLClientextensions = __glXStrdup(buf);
+    cl->GLClientextensions = strdup(buf);

    to_screen = screenInfo.numScreens - 1;

--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@ -44,7 +44,6 @@
 #include <windowstr.h>
 #include "unpack.h"
 #include "glxext.h"
-#include "GL/glx_ansic.h"
 #include "glxvendor.h"

 extern int glxIsExtensionSupported( char *ext );
@ -714,7 +713,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
 	    }
 	    cl->largeCmdBufSize = hdr->length;
 	}
-	__glXMemcpy(cl->largeCmdBuf, pc, req->dataBytes);
+	memcpy(cl->largeCmdBuf, pc, req->dataBytes);

 	cl->largeCmdBytesSoFar = req->dataBytes;
 	cl->largeCmdBytesTotal = hdr->length;
@ -737,7 +736,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
 	    return __glXBadLargeRequest;
       }

-       __glXMemcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
+       memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
 	           pc, req->dataBytes);

       cl->largeCmdBytesSoFar += req->dataBytes;
@ -759,7 +758,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
 	    return __glXBadLargeRequest;
       }

-       __glXMemcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
+       memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
 	           pc, req->dataBytes);

       cl->largeCmdBytesSoFar += req->dataBytes;
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@ -79,7 +79,7 @@ static void ResetClientState(int clientIndex)
    }

    keep_be_displays = cl->be_displays;
-    __glXMemset(cl, 0, sizeof(__GLXclientState));
+    memset(cl, 0, sizeof(__GLXclientState));
    cl->be_displays = keep_be_displays;

    /*
@ -90,7 +90,7 @@ static void ResetClientState(int clientIndex)
    cl->GLClientminorVersion = 0;
    if (cl->GLClientextensions) __glXFree(cl->GLClientextensions);

-    __glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
+    memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
 }


@ -414,14 +414,14 @@ static int __glXDispatch(ClientPtr client)
 	if (!cl) {
 	    return BadAlloc;
 	}
-	__glXMemset(cl, 0, sizeof(__GLXclientState));
+	memset(cl, 0, sizeof(__GLXclientState));

 	cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) );
 	if (!cl->be_displays) {
 	    __glXFree( cl );
 	    return BadAlloc;
 	}
-	__glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
+	memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
    }
    
    if (!cl->inUse) {
@ -468,7 +468,7 @@ static int __glXSwapDispatch(ClientPtr client)
 	if (!cl) {
 	    return BadAlloc;
 	}
-	__glXMemset(cl, 0, sizeof(__GLXclientState));
+	memset(cl, 0, sizeof(__GLXclientState));

 	cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) );
 	if (!cl->be_displays) {
@ -476,7 +476,7 @@ static int __glXSwapDispatch(ClientPtr client)
 	    return BadAlloc;
 	}

-	__glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
+	memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
    }
    
    if (!cl->inUse) {
--- a/hw/dmx/glxProxy/glxscreens.c
+++ b/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>

--- a/hw/dmx/glxProxy/glxserver.h
+++ b/hw/dmx/glxProxy/glxserver.h
@ -46,7 +46,6 @@
 #include <extnsionst.h>
 #include <resource.h>
 #include <scrnintstr.h>
-#include "GL/glx_ansic.h"


 /*
--- a/hw/dmx/glxProxy/glxutil.c
+++ b/hw/dmx/glxProxy/glxutil.c
@ -41,7 +41,6 @@
 #include <pixmapstr.h>
 #include <windowstr.h>
 #include "glxutil.h"
-#include "GL/glx_ansic.h"

 /************************************************************************/

@ -82,7 +81,7 @@ __glXCalloc(size_t numElements, size_t elementSize)
 	/* XXX: handle out of memory error */
 	return NULL;
    }
-    __glXMemset(addr, 0, size);
+    memset(addr, 0, size);
    return addr;
 }

--- a/hw/dmx/glxProxy/glxvisuals.c
+++ b/hw/dmx/glxProxy/glxvisuals.c
@ -37,6 +37,7 @@
 #include <dmx-config.h>
 #endif

+#include <assert.h>
 #include "dmx.h"
 #include "glxserver.h"
 #include "glxutil.h"
--- a/hw/dmx/input/Makefile.am
+++ b/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) \
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@ -1814,7 +1814,7 @@ KdXVCopyPackedData(KdScreenInfo *screen, CARD8 *src, CARD8 *dst, int randr,
    src = src + top * srcDown + left * srcRight;

    w >>= 1;
-    srcRight >>= 1;
+    /* srcRight >>= 1; */
    srcNext = srcRight >> 1;
    while (h--) {
 	CARD16 *s = (CARD16 *)src;
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@ -450,17 +450,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
    return 0;
 }

-#ifdef DDXTIME /* from ServerOSDefines */
-CARD32
-GetTimeInMillis()
-{
-    struct timeval  tp;
-
-    X_GETTIMEOFDAY(&tp);
-    return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
-}
-#endif
-
 static ColormapPtr InstalledMaps[MAXSCREENS];

 static int
--- a/hw/vfb/Makefile.am
+++ b/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
--- a/hw/xfree86/Makefile.am
+++ b/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
--- a/hw/xfree86/common/Makefile.am
+++ b/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)
--- a/hw/xfree86/common/compiler.h
+++ b/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_t unsigned short
-#       define ulong unsigned long
-#       define ulong_t unsigned long
-#       define uint_t unsigned int
-#       define uchar_t unsigned char
-#      else
-#       include <sys/types.h>
-#      endif /* IN_MODULE */
+#      define ushort unsigned short
+#      define ushort_t unsigned short
+#      define ulong unsigned long
+#      define ulong_t unsigned long
+#      define uint_t unsigned int
+#      define uchar_t unsigned char
 #     endif /* __UNIXWARE__ */
 #     if !defined(sgi) && !defined(__SUNPRO_C)
 #      include <sys/inline.h>
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@ -347,10 +347,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
--- a/hw/xfree86/common/xf86Config.c
+++ b/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 */
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@ -39,9 +39,7 @@
 #include <pciaccess.h>
 #include "Pci.h"
 #include "os.h"
-#ifdef XFree86LOADER
 #include "loaderProcs.h"
-#endif
 #include "xf86.h"
 #include "xf86Config.h"
 #include "xf86_OSlib.h"
@ -605,7 +603,6 @@ configureFlagsSection (void)
 static XF86ConfModulePtr
 configureModuleSection (void)
 {
-#ifdef XFree86LOADER
    char **elist, **el;
    /* Find the list of extension modules. */
    const char *esubdirs[] = {
@ -616,10 +613,8 @@ configureModuleSection (void)
 	"fonts",
 	NULL
    };
-#endif
    parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)

-#ifdef XFree86LOADER
    elist = LoaderListDirs(esubdirs, NULL);
    if (elist) {
 	for (el = elist; *el; el++) {
@ -656,7 +651,6 @@ configureModuleSection (void)
    	}
 	xfree(elist);
    }
-#endif

    return ptr;
 }
@ -666,10 +660,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)
@ -791,10 +783,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);

--- a/hw/xfree86/common/xf86DGA.c
+++ b/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))
--- a/hw/xfree86/common/xf86DoProbe.c
+++ b/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();
--- a/hw/xfree86/common/xf86DoScanPci.c
+++ b/hw/xfree86/common/xf86DoScanPci.c
@ -41,9 +41,6 @@
 #include <X11/Xmd.h>
 #include <pciaccess.h>
 #include "os.h"
-#ifdef XFree86LOADER
-#include "loaderProcs.h"
-#endif
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Pci.h"
--- a/hw/xfree86/common/xf86Globals.c
+++ b/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[] = {
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@ -73,7 +73,6 @@
 static int xf86ScrnInfoPrivateCount = 0;


-#ifdef XFree86LOADER
 /* Add a pointer to a new DriverRec to xf86DriverList */

 _X_EXPORT void
@ -175,7 +174,6 @@ xf86DeleteModuleInfo(int idx)
 	xf86ModuleInfoList[idx] = NULL;
    }
 }
-#endif


 /* Allocate a new ScrnInfoRec in xf86Screens */
@ -202,11 +200,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?
@ -263,10 +257,8 @@ xf86DeleteScreen(int scrnIndex, int flags)

    xf86OptionListFree(pScrn->options);

-#ifdef XFree86LOADER
    if (pScrn->module)
 	UnloadModule(pScrn->module);
-#endif

    if (pScrn->drv)
 	pScrn->drv->refCount--;
@ -324,11 +316,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;
@ -355,10 +343,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--;
@ -2386,17 +2372,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;

@ -2405,15 +2386,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;

@ -2422,9 +2399,6 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
    if (!ret)
 	LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
    return ret;
-#else
-    return (pointer)1;
-#endif
 }

 /*
@ -2433,9 +2407,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;
    
@ -2457,13 +2429,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;
 }
@ -2475,7 +2443,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
 }
@ -2483,59 +2451,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
 }


--- a/hw/xfree86/common/xf86InPriv.h
+++ b/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 */
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@ -62,9 +62,7 @@

 #include "compiler.h"

-#ifdef XFree86LOADER
 #include "loaderProcs.h"
-#endif
 #ifdef XFreeXDGA
 #include "dgaproc.h"
 #endif
@ -505,10 +503,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;
@ -566,7 +562,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
    if (!autoconfig)
 	PostConfigInit();

-#ifdef XFree86LOADER
    /* Initialise the loader */
    LoaderInit();

@ -604,7 +599,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 		ErrorF("video driver: %s\n", *l);
 	LoaderFreeDirList(list);
    }
-#endif
 #endif

    xf86OpenConsole();
@ -629,7 +623,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);
@ -660,7 +653,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
@ -892,12 +884,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.
@ -1202,12 +1192,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();

@ -1387,9 +1375,7 @@ OsVendorInit()
  signal(SIGCHLD, SIG_DFL);	/* Need to wait for child processes */
 #endif
  OsDelayInitColors = TRUE;
-#ifdef XFree86LOADER
  loadableFonts = TRUE;
-#endif

  if (!beenHere)
    xf86LogInit();
@ -1681,9 +1667,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"))
@ -2090,9 +2074,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
@ -2139,7 +2121,6 @@ xf86RunVtInit(void)
    }
 }

-#ifdef XFree86LOADER
 /*
 * xf86LoadModules iterates over a list that is being passed in.
 */             
@ -2182,8 +2163,6 @@ xf86LoadModules(char **list, pointer *optlist)
    return !failed;
 }

-#endif
-
 /* Pixmap format stuff */

 _X_EXPORT PixmapFormatPtr
--- a/hw/xfree86/common/xf86Io.c
+++ b/hw/xfree86/common/xf86Io.c
@ -470,32 +470,3 @@ searchdone:
  }
  return (Success);
 }
-
-#if defined(DDXTIME) && !defined(QNX4)
-/*
- * These are getting tossed in here until I can think of where
- * they really belong
- */
-#define HALFMONTH ((unsigned long) 1<<31)
-_X_EXPORT CARD32
-GetTimeInMillis()
-{
-    struct timeval  tp;
-    register CARD32 val;
-    register INT32 diff;
-    static CARD32 oldval = 0;
-    static CARD32 time = 0;
-
-    gettimeofday(&tp, 0);
-    val = (tp.tv_sec * 1000) + (tp.tv_usec / 1000);
-    if (oldval) {
-	diff = val - oldval;
-	if (diff > 0)
-	    time += diff;
-    }
-    oldval = val;
-
-    return time;
-}
-#endif /* DDXTIME && !QNX4 */
-
--- a/hw/xfree86/common/xf86MiscExt.c
+++ b/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)) {
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@ -97,13 +97,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;
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@ -328,7 +328,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
@ -342,7 +341,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
--- a/hw/xfree86/common/xf86xv.c
+++ b/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))
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/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 {
--- a/hw/xfree86/ddc/Makefile.am
+++ b/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
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/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
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/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
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/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 \
--- a/hw/xfree86/doc/sgml/DESIGN.sgml
+++ b/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(mgaSetup);
+static MODULESETUPPROTO(zzzSetup);

 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
--- a/hw/xfree86/dri/Makefile.am
+++ b/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@
--- a/hw/xfree86/dri/dri.c
+++ b/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();

--- a/hw/xfree86/dummylib/Makefile.am
+++ b/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
--- a/hw/xfree86/exa/Makefile.am
+++ b/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
--- a/hw/xfree86/fbdevhw/Makefile.am
+++ b/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

--- a/hw/xfree86/i2c/Makefile.am
+++ b/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

--- a/hw/xfree86/i2c/bt829.h
+++ b/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
--- a/hw/xfree86/i2c/fi1236.h
+++ b/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
--- a/hw/xfree86/i2c/i2c_def.h
+++ b/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
--- a/hw/xfree86/i2c/msp3430.h
+++ b/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
--- a/hw/xfree86/i2c/tda8425.h
+++ b/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
--- a/hw/xfree86/i2c/tda9850.h
+++ b/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
--- a/hw/xfree86/i2c/tda9885.h
+++ b/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
--- a/hw/xfree86/i2c/uda1380.h
+++ b/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
--- a/hw/xfree86/int10/Makefile.am
+++ b/hw/xfree86/int10/Makefile.am
@ -2,19 +2,22 @@ module_LTLIBRARIES = libint10.la

 sdk_HEADERS = xf86int10.h

-EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+EXTRA_CFLAGS =

 libint10_la_LDFLAGS = -avoid-version

+COMMON_SOURCES = \
+	helper_exec.c \
+	helper_mem.c \
+	pci.c \
+	xf86int10.c \
+	xf86int10module.c
+
 if INT10_VM86
 AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 INCLUDES = $(XORG_INCS)
 libint10_la_SOURCES = \
-	helper_exec.c \
-	helper_mem.c \
-	pci.c \
-	xf86int10.c \
-	xf86int10module.c \
+	$(COMMON_SOURCES) \
 	$(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \
 	$(srcdir)/../os-support/linux/int10/linux.c
 endif
@ -22,8 +25,11 @@ endif
 if INT10_X86EMU
 AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
-libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
-	xf86int10.c xf86x86emu.c generic.c x86emu.c
+libint10_la_SOURCES = \
+	$(COMMON_SOURCES) \
+	xf86x86emu.c \
+	generic.c \
+	x86emu.c
 endif

 if INT10_STUB
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@ -63,12 +63,6 @@ static void UnmapVRam(xf86Int10InfoPtr pInt);

 static void *sysMem = NULL;

-xf86Int10InfoPtr
-xf86InitInt10(int entityIndex)
-{
-    return xf86ExtendedInitInt10(entityIndex, 0);
-}
-
 xf86Int10InfoPtr
 xf86ExtendedInitInt10(int entityIndex, int Flags)
 {
@ -149,59 +143,12 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
    
    if (xf86IsEntityPrimary(entityIndex) 
 	&& !(initPrimary(options))) {
-	
-	if (bios.bus == BUS_ISA && bios.location.legacy) {
-	    xf86DrvMsg(screen, X_CONFIG,
-			   "Overriding BIOS location: 0x%x\n",
-		       bios.location.legacy);
-	    cs = bios.location.legacy >> 4;
-#define CHECK_V_SEGMENT_RANGE(x)   \
-               if (((x) << 4) < V_BIOS) {\
-		   xf86DrvMsg(screen, X_ERROR, \
-		              "V_BIOS address 0x%lx out of range\n", \
-			      (unsigned long)(x) << 4); \
-		    goto error1; \
-	       }
-	    CHECK_V_SEGMENT_RANGE(cs);
-	    vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4);
-	    if (!int10_check_bios(screen, cs, vbiosMem)) {
-		xf86DrvMsg(screen, X_ERROR,
-			   "No V_BIOS at specified address 0x%lx\n",
-			   (unsigned long)cs << 4);
-		goto error1;
-	    }
-	} else {
-	    if (bios.bus == BUS_PCI) {
-		xf86DrvMsg(screen, X_WARNING,
-			   "Option BiosLocation for primary device ignored: "
-			   "It points to PCI.\n");
-		xf86DrvMsg(screen, X_WARNING,
-			   "You must set Option InitPrimary also\n");
-	    }
-	    
-	    cs = MEM_RW(pInt,((0x10<<2)+2));
-	    CHECK_V_SEGMENT_RANGE(cs);
-	    vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4);
-	    if (!int10_check_bios(screen, cs, vbiosMem)) {
-		cs = MEM_RW(pInt, (0x42 << 2) + 2);
-		CHECK_V_SEGMENT_RANGE(cs);
-		vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4);
-		if (!int10_check_bios(screen, cs, vbiosMem)) {
-		    cs = V_BIOS >> 4;
-		    vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4);
-		    if (!int10_check_bios(screen, cs, vbiosMem)) {
-			xf86DrvMsg(screen, X_ERROR, "No V_BIOS found\n");
-			goto error1;
-		    }
-		}
-	    }
+	if (! xf86int10GetBiosSegment(pInt, &bios, 
+				      (unsigned char *)sysMem - V_BIOS)) {
+	    goto error1;
 	}
-	
-	xf86DrvMsg(screen, X_INFO, "Primary V_BIOS segment is: 0x%lx\n",
-		   (unsigned long)cs);

 	set_return_trap(pInt);
-	pInt->BIOSseg = cs;

 	pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
 	if (! (pInt->Flags & SET_BIOS_SCRATCH))
@ -209,54 +156,33 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
 	xf86Int10SaveRestoreBIOSVars(pInt, TRUE);
 	
    } else {
-	BusType location_type;
+	const BusType location_type = xf86int10GetBiosLocationType(pInt,
+								   &bios);
 	int bios_location = V_BIOS;
-	int pci_entity;
-	
-        EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex);
+
        reset_int_vect(pInt);
 	set_return_trap(pInt);

-	if (bios.bus != BUS_NONE) {
-	    switch (location_type = bios.bus) {
-	    case BUS_PCI:
-		xf86DrvMsg(screen,X_CONFIG,"Overriding bios location: "
-			   "PCI:%i:%i%i\n",bios.location.pci.bus,
-			   bios.location.pci.dev,bios.location.pci.func);
-		break;
-	    case BUS_ISA:
-		bios_location = bios.location.legacy;
-		if (bios.location.legacy)
-		    xf86DrvMsg(screen,X_CONFIG,"Overriding bios location: "
-			       "Legacy:0x%x\n",bios.location.legacy);
-		else
-		    xf86DrvMsg(screen,X_CONFIG,"Overriding bios location: "
-			       "Legacy\n");
-		break;
-	    default:
-		break;
-	    }
-	} else
-	    location_type = pEnt->location.type;
-	
-	xfree(pEnt);
-
 	switch (location_type) {
-	case BUS_PCI:
+	case BUS_PCI: {
+	    const int pci_entity = (bios.bus == BUS_PCI)
+	      ? xf86GetPciEntity(bios.location.pci.bus,
+				 bios.location.pci.dev,
+				 bios.location.pci.func)
+	      : pInt->entityIndex;
+
 	    vbiosMem = (unsigned char *)base + bios_location;
-	    if (bios.bus == BUS_PCI)
-		pci_entity = xf86GetPciEntity(bios.location.pci.bus,
-					      bios.location.pci.dev,
-					      bios.location.pci.func);
-	    else 
-		pci_entity = pInt->entityIndex;
 	    if (!(size = mapPciRom(pci_entity,(unsigned char *)(vbiosMem)))) {
 		xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (3)\n");
 		goto error1;
 	    }
 	    INTPriv(pInt)->highMemory = GET_HIGH_BASE(size);
 	    break;
+	}
 	case BUS_ISA:
+	    if (bios.bus == BUS_ISA) {
+		bios_location = bios.location.legacy;
+	    }
 	    vbiosMem = (unsigned char *)sysMem + bios_location;
 #if 0
 	    (void)memset(vbiosMem, 0, V_BIOS_SIZE);
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@ -594,7 +594,7 @@ pciCfg1outb(CARD16 addr, CARD8 val)
 }

 CARD8
-bios_checksum(CARD8 *start, int size)
+bios_checksum(const CARD8 *start, int size)
 {
    CARD8 sum = 0;

@ -703,3 +703,9 @@ xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
    xf86UnMapVidMem(pInt->scrnIndex,base - BIOS_SCRATCH_OFF ,pagesize);
 }
 #endif
+
+xf86Int10InfoPtr
+xf86InitInt10(int entityIndex)
+{
+    return xf86ExtendedInitInt10(entityIndex, 0);
+}
--- a/hw/xfree86/int10/helper_mem.c
+++ b/hw/xfree86/int10/helper_mem.c
@ -224,7 +224,7 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex)
 }

 Bool
-int10skip(void* options)
+int10skip(const void* options)
 {
    Bool noint10 = FALSE;

@ -235,7 +235,7 @@ int10skip(void* options)
 }

 Bool
-int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem)
+int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem)
 {
    int size;

@ -262,7 +262,7 @@ int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem)
 }

 Bool
-initPrimary(void* options)
+initPrimary(const void* options)
 {
    Bool initPrimary = FALSE;

@ -281,39 +281,33 @@ initPrimary(void* options)
 * be used with extreme care.
 */
 void
-xf86int10ParseBiosLocation(void* options, 
+xf86int10ParseBiosLocation(const void* options,
 			   xf86int10BiosLocationPtr bios)
 {
-    char *s;
-    char *p;
-    char *str = NULL;
-
-    if (options)
-	str = xf86GetOptValString(options,OPT_BIOS_LOCATION);
+    const char *p;
+    const char *str;

    bios->bus = BUS_NONE;
-    if (!str)
-	return;
-    
-    s = xstrdup(str);
-    p = strtok(s,":");
-    if (xf86NameCmp(p,"pci") == 0) bios->bus = BUS_PCI;
-    else
-	if (xf86NameCmp(p,"primary") == 0) bios->bus = BUS_ISA;

-    xfree(s);
+    if ((options == NULL) 
+	|| ((str = xf86GetOptValString(options, OPT_BIOS_LOCATION)) == NULL)) {
+	return;
+    }
+
+    if (strncasecmp(str, "pci", 3) == 0) {
+	bios->bus = BUS_PCI;
+    } else if (strncasecmp(str, "primary", 7) == 0) {
+	bios->bus = BUS_ISA;
+    }
+    else {
+	return;
+    }
    
-    if (bios->bus == BUS_NONE) return;
-    
-    s = xstrdup(str);
-    p = strchr(s, ':');
+    p = strchr(str, ':');
 		     
    switch (bios->bus) {
    case BUS_ISA:
-	if (p)
-	    bios->location.legacy = atoi(++p);
-	else
-	    bios->location.legacy = 0;
+	bios->location.legacy = (p != NULL) ? atoi(++p) : 0;
 	break;
    case BUS_PCI:
 	if (p) {
@ -332,8 +326,107 @@ xf86int10ParseBiosLocation(void* options,
    default:
 	break;
    }
-    xfree(s);
 }


+BusType
+xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt,
+			     const xf86int10BiosLocationPtr bios)
+{
+    BusType location_type = bios->bus;

+    switch (location_type) {
+    case BUS_PCI:
+	xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: "
+		   "PCI:%i:%i%i\n",bios->location.pci.bus,
+		   bios->location.pci.dev,bios->location.pci.func);
+	break;
+    case BUS_ISA:
+	if (bios->location.legacy)
+	    xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: "
+		       "Legacy:0x%x\n",bios->location.legacy);
+	else
+	    xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: "
+		       "Legacy\n");
+	break;
+    case BUS_NONE: {
+	EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex);
+	location_type = pEnt->location.type;
+	xfree(pEnt);
+	break;
+    }
+    default:
+	break;
+    }
+
+    return location_type;
+}
+
+
+#define CHECK_V_SEGMENT_RANGE(x)   \
+    if (((x) << 4) < V_BIOS) { \
+	xf86DrvMsg(pInt->scrnIndex, X_ERROR, \
+		   "V_BIOS address 0x%lx out of range\n", \
+		   (unsigned long)(x) << 4); \
+	return FALSE; \
+    }
+
+Bool
+xf86int10GetBiosSegment(xf86Int10InfoPtr pInt,
+			const xf86int10BiosLocationPtr bios, void * base)
+{
+    unsigned i;
+    int cs = ~0;
+    int segments[4];
+    const char * format;
+
+
+    if (bios->bus == BUS_ISA && bios->location.legacy) {
+	xf86DrvMsg(pInt->scrnIndex, X_CONFIG, 
+		   "Overriding BIOS location: 0x%x\n",
+		   bios->location.legacy);
+
+	segments[0] = bios->location.legacy >> 4;
+	segments[1] = ~0;
+
+	format = "No V_BIOS at specified address 0x%lx\n";
+    } else {
+	if (bios->bus == BUS_PCI) {
+	    xf86DrvMsg(pInt->scrnIndex, X_WARNING,
+		       "Option BiosLocation for primary device ignored: "
+		       "It points to PCI.\n");
+	    xf86DrvMsg(pInt->scrnIndex, X_WARNING,
+		       "You must set Option InitPrimary also\n");
+	}
+
+	segments[0] = MEM_RW(pInt, (0x10 << 2) + 2);
+	segments[1] = MEM_RW(pInt, (0x42 << 2) + 2);
+	segments[2] = V_BIOS >> 4;
+	segments[3] = ~0;
+
+	format = "No V_BIOS found\n";
+    }
+
+    for (i = 0; segments[i] != ~0; i++) {
+	unsigned char * vbiosMem;
+
+	cs = segments[i];
+
+	CHECK_V_SEGMENT_RANGE(cs);
+	vbiosMem = (unsigned char *)base + (cs << 4);
+	if (int10_check_bios(pInt->scrnIndex, cs, vbiosMem)) {
+	    break;
+	}
+    }
+
+    if (segments[i] == ~0) {
+	xf86DrvMsg(pInt->scrnIndex, X_ERROR, format, (unsigned long)cs << 4);
+	return FALSE;
+    }
+
+    xf86DrvMsg(pInt->scrnIndex, X_INFO, "Primary V_BIOS segment is: 0x%lx\n",
+	       (unsigned long)cs);
+
+    pInt->BIOSseg = cs;
+    return TRUE;
+}
--- a/hw/xfree86/int10/xf86int10.h
+++ b/hw/xfree86/int10/xf86int10.h
@ -143,7 +143,7 @@ void dump_code(xf86Int10InfoPtr pInt);
 void dump_registers(xf86Int10InfoPtr pInt);
 void stack_trace(xf86Int10InfoPtr pInt);
 xf86Int10InfoPtr getInt10Rec(int entityIndex);
-CARD8 bios_checksum(CARD8 *start, int size);
+CARD8 bios_checksum(const CARD8 *start, int size);
 void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
 void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
 #if defined (_PC)
@ -182,11 +182,16 @@ int setup_system_bios(void *base_addr);
 void reset_int_vect(xf86Int10InfoPtr pInt);
 void set_return_trap(xf86Int10InfoPtr pInt);
 void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex);
-Bool int10skip(void* options);
-Bool int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem);
-Bool initPrimary(void* options);
-void xf86int10ParseBiosLocation(void* options, 
+Bool int10skip(const void* options);
+Bool int10_check_bios(int scrnIndex, int codeSeg,
+    const unsigned char* vbiosMem);
+Bool initPrimary(const void* options);
+void xf86int10ParseBiosLocation(const void* options, 
 				xf86int10BiosLocationPtr bios);
+BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt,
+    const xf86int10BiosLocationPtr bios);
+Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt,
+    const xf86int10BiosLocationPtr bios, void * base);
 #ifdef DEBUG
 void dprint(unsigned long start, unsigned long size);
 #endif
--- a/hw/xfree86/loader/Makefile.am
+++ b/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
--- a/hw/xfree86/os-support/bsd/Makefile.am
+++ b/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)

--- a/hw/xfree86/os-support/bsd/bsd_jstk.c
+++ b/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 */
--- a/hw/xfree86/os-support/bus/Makefile.am
+++ b/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)
--- a/hw/xfree86/os-support/drm/Makefile.am
+++ b/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@ \
-                   @SERVER_DEFINES@ \
-                   @LOADER_DEFINES@
+                   @LIBDRM_CFLAGS@
+
 libdrm_la_LDFLAGS = -module -avoid-version
 libdrm_ladir = $(moduledir)/@XORG_OS@
 libdrm_la_SOURCES = \
--- a/hw/xfree86/os-support/drm/xf86drm.c
+++ b/hw/xfree86/os-support/drm/xf86drm.c
@ -37,18 +37,10 @@
 #include <xorg-config.h>
 #endif

-#ifdef XFree86Server
-# include "xf86.h"
-# include "xf86_OSproc.h"
-# define _DRM_MALLOC xalloc
-# define _DRM_FREE   xfree
-# ifndef XFree86LOADER
-#  include <sys/mman.h>
-# endif
-#else
-# define _DRM_MALLOC malloc
-# define _DRM_FREE   free
-#endif
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#define _DRM_MALLOC xalloc
+#define _DRM_FREE   xfree

 #include "drm.h"
 #include <stdio.h>
@ -124,19 +116,9 @@ drmMsg(const char *format, ...)
 {
    va_list	ap;

-#ifndef XFree86Server
-    const char *env;
-    if ((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose"))
-#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);
-    }
+    va_start(ap, format);
+    xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);
+    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
--- a/hw/xfree86/os-support/drm/xf86drmHash.c
+++ b/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"
-# endif
+# include "xf86.h"
 #endif

 #define N(x)  drm##x
--- a/hw/xfree86/os-support/drm/xf86drmRandom.c
+++ b/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"
-# endif
+# include "xf86.h"
 #endif

 #define N(x)  drm##x
--- a/hw/xfree86/os-support/drm/xf86drmSL.c
+++ b/hw/xfree86/os-support/drm/xf86drmSL.c
@ -53,12 +53,7 @@
 #else
 # include "drm.h"
 # include "xf86drm.h"
-# ifdef XFree86LOADER
-#  include "xf86.h"
-# else
-#  include <stdio.h>
-#  include <stdlib.h>
-# endif
+# include "xf86.h"
 #endif

 #define N(x)  drm##x
--- a/Show More
+++ b/Show More