From 66362441867f68dac97de33744bd0ca478fb65d3 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Tue, 10 Jul 2012 02:03:29 +0100
Subject: Remove last renmants of XFree86LOADER define

Not to be confused with XFree86Loader or XorgLoader.  Which are both now
dead too.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 configure.ac             | 1 -
 hw/xquartz/xpr/dri.c     | 5 -----
 include/xorg-server.h.in | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index b225632c0..209b237b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1817,7 +1817,6 @@ if test "x$XORG" = xyes; then
 	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])
diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
index 663d61d35..03af163f7 100644
--- a/hw/xquartz/xpr/dri.c
+++ b/hw/xquartz/xpr/dri.c
@@ -38,13 +38,8 @@
 #include <dix-config.h>
 #endif
 
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#else
 #include <sys/time.h>
 #include <unistd.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index c0761f78a..81935be5c 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -197,7 +197,7 @@
 #undef WSCONS_SUPPORT
 
 /* Loadable XFree86 server awesomeness */
-#undef XFree86LOADER
+#define XFree86LOADER
 
 /* Use libpciaccess */
 #undef XSERVER_LIBPCIACCESS
-- 
cgit v1.2.3