summaryrefslogtreecommitdiff
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-08-07 07:02:21 (GMT)
committer Jeremy Huddleston <jeremyhu@freedesktop.org>2009-09-27 20:53:01 (GMT)
commite0e2eaf1f30ebce4c0ff28416259d8e976fdf0d7 (patch) (side-by-side diff)
tree1cf666c4e7cbdded6655d1f159a21100c6561799
parent1a0dfde2d102d845f1ceda66ad7a078aa1b42ef9 (diff)
downloadxserver-e0e2eaf1f30ebce4c0ff28416259d8e976fdf0d7.zip
xserver-e0e2eaf1f30ebce4c0ff28416259d8e976fdf0d7.tar.gz
XQuartz: Use internal xshm header for new xextproto
(cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be) (cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xquartz/darwin.c3
1 files changed, 1 insertions, 2 deletions
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"