diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-25 20:11:38 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-25 20:16:47 -0700 |
| commit | 07c935b72fb14cb12f1cb5afbf8cc81f97086bac (patch) | |
| tree | ec38dc10cc96d9e99fb00bc9e50e87b185d7ae21 /hw | |
| parent | 0f613007cd43545eda40825bd74ada3e6e5f36f6 (diff) | |
XQuartz: Use applewmproto 1.4 updated headers.
(cherry picked from commit 203df06c0eb2dcd5adfa788a1ba9569650c15f9c)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xquartz/X11Application.m | 3 | ||||
| -rw-r--r-- | hw/xquartz/X11Controller.m | 3 | ||||
| -rw-r--r-- | hw/xquartz/applewm.c | 2 | ||||
| -rw-r--r-- | hw/xquartz/darwinEvents.c | 3 | ||||
| -rw-r--r-- | hw/xquartz/quartz.c | 2 | ||||
| -rw-r--r-- | hw/xquartz/xpr/xpr.h | 3 | ||||
| -rw-r--r-- | hw/xquartz/xpr/xprAppleWM.c | 3 |
7 files changed, 7 insertions, 12 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 6ade527bd..9fb192648 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -41,8 +41,7 @@ #include "darwinEvents.h" #include "quartzKeyboard.h" #include "quartz.h" -#define _APPLEWM_SERVER_ -#include "X11/extensions/applewm.h" +#include <X11/extensions/applewmconst.h> #include "micmap.h" #include "exglobals.h" diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index 990053705..46ed02241 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -43,8 +43,7 @@ #include "darwin.h" #include "darwinEvents.h" #include "quartz.h" -#define _APPLEWM_SERVER_ -#include "X11/extensions/applewm.h" +#include <X11/extensions/applewmconst.h> #include "applewmExt.h" #include <stdio.h> diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c index ad3858372..330bac4a4 100644 --- a/hw/xquartz/applewm.c +++ b/hw/xquartz/applewm.c @@ -47,7 +47,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/Xatom.h> #include "darwin.h" #define _APPLEWM_SERVER_ -#include "X11/extensions/applewmstr.h" +#include <X11/extensions/applewmproto.h> #include "applewmExt.h" #include "X11Application.h" diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c index 42e12dc58..4822af479 100644 --- a/hw/xquartz/darwinEvents.c +++ b/hw/xquartz/darwinEvents.c @@ -67,9 +67,8 @@ in this Software without prior written authorization from The Open Group. #define SCROLLWHEELLEFTFAKE 6 #define SCROLLWHEELRIGHTFAKE 7 -#define _APPLEWM_SERVER_ +#include <X11/extensions/applewmconst.h> #include "applewmExt.h" -#include <X11/extensions/applewm.h> /* FIXME: Abstract this better */ void QuartzModeEQInit(void); diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index 3f8f8b9e9..ca8b24595 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -45,7 +45,7 @@ #include "X11Application.h" -#include <X11/extensions/applewm.h> +#include <X11/extensions/applewmconst.h> #include <X11/extensions/randr.h> // X headers 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" |