xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/darwinEvents.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 1f8188656a075dc7b1bb27a0795b5bd43610bbc8
Author: Ben Byer <bbyer at apple.com>
Date:   Tue Apr 8 20:37:25 2008 -0700

    add missing dix-config include
    (cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)

diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 410acdd..78708d2 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -30,6 +30,10 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #define NEED_EVENTS
 #include   <X11/X.h>
 #include   <X11/Xmd.h>