xserver: Branch 'master' - 2 commits

[Michel Daenzer]

 Xext/fontcache.c         |    4 ++--
 hw/dmx/Makefile.am       |    1 +
 hw/dmx/dmx.h             |    4 ++++
 hw/xfree86/common/xf86.h |    6 ++++++
 hw/xnest/Makefile.am     |    2 +-
 mi/mieq.c                |    4 ++++
 6 files changed, 18 insertions(+), 3 deletions(-)

New commits:
diff-tree 8356be492c6b46abdffa08b13836571ed872e16f (from f6ce0839ba5b73247097826d28f7388fe248ec0c)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Sep 6 15:20:55 2006 +0200

    Make sure _XSERVER64 is defined when it should be and gets tested.

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 81b62f1..d36647b 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -83,6 +83,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
 
 Xdmx_CFLAGS = \
               -DHAVE_DMX_CONFIG_H \
+              $(DIX_CFLAGS) \
               $(GLX_INCS) \
               $(GLX_DEFS) \
               @DMXMODULES_CFLAGS@
diff --git a/hw/dmx/dmx.h b/hw/dmx/dmx.h
index 18e75de..becb2da 100644
--- a/hw/dmx/dmx.h
+++ b/hw/dmx/dmx.h
@@ -51,6 +51,10 @@
 #ifndef DMX_H
 #define DMX_H
 
+#if HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "gcstruct.h"
 
 /* Handle client-side include files in one place. */
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 4903791..4587500 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -36,6 +36,12 @@
 #ifndef _XF86_H
 #define _XF86_H
 
+#if HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#elif HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "xf86str.h"
 #include "xf86Opt.h"
 #include <X11/Xfuncproto.h>
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index b237788..d40d122 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -51,7 +51,7 @@ Xnest_LDFLAGS =
 
 AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
             -DNO_HW_ONLY_EXTS \
- \
+            $(DIX_CFLAGS) \
             $(XNESTMODULES_CFLAGS)
 
 EXTRA_DIST = os2Stub.c \
diff --git a/mi/mieq.c b/mi/mieq.c
index a7c6f9a..a69ce70 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -32,6 +32,10 @@ in this Software without prior written a
  *
  */
 
+#if HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 # define NEED_EVENTS
 # include   <X11/X.h>
 # include   <X11/Xmd.h>
diff-tree f6ce0839ba5b73247097826d28f7388fe248ec0c (from 410e5b1d738ba47b36778e6cbed44023a27ce259)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Sep 6 13:18:02 2006 +0200

    Fix #include paths for fontcacheproto headers.

diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index 00a45c9..db03481 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -45,8 +45,8 @@
 #include "inputstr.h"
 #include "servermd.h"
 #define _FONTCACHE_SERVER_
-#include "fontcacheP.h"
-#include "fontcachstr.h"
+#include <X11/extensions/fontcacheP.h>
+#include <X11/extensions/fontcachstr.h>
 #include <X11/Xfuncproto.h>
 
 #include "swaprep.h"