From 07c935b72fb14cb12f1cb5afbf8cc81f97086bac Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue, 25 Aug 2009 20:11:38 -0700
Subject: XQuartz: Use applewmproto 1.4 updated headers. (cherry picked from
 commit 203df06c0eb2dcd5adfa788a1ba9569650c15f9c)

---
 hw/xquartz/xpr/xpr.h        | 3 +--
 hw/xquartz/xpr/xprAppleWM.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'hw/xquartz/xpr')

diff --git a/hw/xquartz/xpr/xpr.h b/hw/xquartz/xpr/xpr.h
index b329ca118..c657e1586 100644
--- a/hw/xquartz/xpr/xpr.h
+++ b/hw/xquartz/xpr/xpr.h
@@ -53,8 +53,7 @@ void QuartzResumeXCursor(ScreenPtr pScreen, int x, int y);
  * See CGWindowLevel.h
  */
 
-#define _APPLEWM_SERVER_
-#include <X11/extensions/applewm.h>
+#include <X11/extensions/applewmconst.h>
 static const int normal_window_levels[AppleWMNumWindowLevels+1] = {
 0, 3, 4, 5, INT_MIN + 30, INT_MIN + 29,
 };
diff --git a/hw/xquartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c
index 0a2571975..4b31e3a11 100644
--- a/hw/xquartz/xpr/xprAppleWM.c
+++ b/hw/xquartz/xpr/xprAppleWM.c
@@ -33,8 +33,7 @@
 
 #include "xpr.h"
 
-#define _APPLEWM_SERVER_
-#include <X11/extensions/applewmstr.h>
+#include <X11/extensions/applewmproto.h>
 
 #include "applewmExt.h"
 #include "rootless.h"
-- 
cgit v1.2.3