summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-07-10 02:03:29 +0100
committerKeith Packard <keithp@keithp.com>2012-07-10 00:31:02 -0700
commit66362441867f68dac97de33744bd0ca478fb65d3 (patch)
treeca893d426094fe6713ad64046a81ebe3ebfff7cd
parenta15dac550918c55b08bbe0007f068cc5096ebaa1 (diff)
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>
-rw-r--r--configure.ac1
-rw-r--r--hw/xquartz/xpr/dri.c5
-rw-r--r--include/xorg-server.h.in2
3 files changed, 1 insertions, 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
1817 AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) 1817 AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
1818 AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) 1818 AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
1819 AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) 1819 AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
1820 AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
1821 AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) 1820 AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
1822 AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) 1821 AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
1823 AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) 1822 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 @@
38#include <dix-config.h> 38#include <dix-config.h>
39#endif 39#endif
40 40
41#ifdef XFree86LOADER
42#include "xf86.h"
43#include "xf86_ansic.h"
44#else
45#include <sys/time.h> 41#include <sys/time.h>
46#include <unistd.h> 42#include <unistd.h>
47#endif
48 43
49#include <X11/X.h> 44#include <X11/X.h>
50#include <X11/Xproto.h> 45#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 @@
197#undef WSCONS_SUPPORT 197#undef WSCONS_SUPPORT
198 198
199/* Loadable XFree86 server awesomeness */ 199/* Loadable XFree86 server awesomeness */
200#undef XFree86LOADER 200#define XFree86LOADER
201 201
202/* Use libpciaccess */ 202/* Use libpciaccess */
203#undef XSERVER_LIBPCIACCESS 203#undef XSERVER_LIBPCIACCESS