From 140463a197fb93d0a4bfad924efc35b860e8cc54 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat, 11 Apr 2009 16:53:59 -0700
Subject: [PATCH] XQuartz: Use correct values for ProximityIn and ProximityOut

This was the other underlying cause of teh 100% CPU tablet issue.
(cherry picked from commit a9cecf34c23fbcd59b56b380c51d31a9fabc3eb7)
---
 hw/xquartz/X11Application.m | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 7bac8db20..0445b8e29 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -44,6 +44,7 @@
 #define _APPLEWM_SERVER_
 #include "X11/extensions/applewm.h"
 #include "micmap.h"
+#include "exglobals.h"
 
 #include <mach/mach.h>
 #include <unistd.h>
@@ -60,9 +61,6 @@ extern BOOL xpbproxy_init (void);
 #define XSERVER_VERSION "?"
 #endif
 
-#define ProximityIn    0
-#define ProximityOut   1
-
 /* Stuck modifier / button state... force release when we context switch */
 static NSEventType keyState[NUM_KEYCODES];