xserver: Branch 'xorg-server-1.7-apple'

[Jeremy Huddleston]

 hw/xquartz/darwin.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 28cb37f73e79b1986fc38fb9a90989560f21ff3a
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Aug 7 00:02:21 2009 -0700

    XQuartz: Use internal xshm header for new xextproto
    (cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be)
    (cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 7129ac6..5ad5392 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -67,8 +67,7 @@
 #include <IOKit/hidsystem/IOHIDLib.h>
 
 #ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/XShm.h>
+#include "shmint.h"
 #endif
 
 #include "darwin.h"