xserver: Branch 'xorg-server-1.4-apple' - 2 commits

[Jeremy Huddleston]

 hw/xquartz/pbproxy/main.m        |    1 -
 hw/xquartz/pbproxy/pbproxy.h     |   11 ++++-------
 hw/xquartz/pbproxy/x-selection.h |    4 +++-
 hw/xquartz/pbproxy/x-selection.m |    2 --
 mi/mieq.c                        |    8 ++++----
 5 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 6622efca216663c99d112c7a226bde691d1f3215
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Oct 23 15:01:03 2008 -0700

    XQuartz: pbproxy: Fix compilation on case-sensitive file systems...

diff --git a/hw/xquartz/pbproxy/main.m b/hw/xquartz/pbproxy/main.m
index 231b212..f023eee 100644
--- a/hw/xquartz/pbproxy/main.m
+++ b/hw/xquartz/pbproxy/main.m
@@ -8,7 +8,6 @@
 
 #include <pthread.h>
 #include <X11/extensions/applewm.h>
-#include <X11/extensions/xfixes.h>
 
 Display *x_dpy;
 int x_apple_wm_event_base, x_apple_wm_error_base;
diff --git a/hw/xquartz/pbproxy/pbproxy.h b/hw/xquartz/pbproxy/pbproxy.h
index 1b0ed2b..324d56c 100644
--- a/hw/xquartz/pbproxy/pbproxy.h
+++ b/hw/xquartz/pbproxy/pbproxy.h
@@ -12,10 +12,6 @@
 #include <X11/extensions/shape.h>
 #undef   Cursor
 
-#ifndef DEBUG
-#define DEBUG 0
-#endif
-
 #ifndef INTEGRATED_XPBPROXY
 extern BOOL prefs_reload;
 #endif
@@ -36,11 +32,12 @@ extern BOOL have_xfixes;
 extern BOOL x_input_register (void);
 extern void x_input_run (void);
 
-#if DEBUG == 0
-# define DB(msg, args...) do {} while (0)
-#else
+#ifdef DEBUG
 /* BEWARE: this can cause a string memory leak, according to the leaks program. */
 # define DB(msg, args...) debug_printf("%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args)
+#else
+# define DB(msg, args...) do {} while (0)
+#else
 #endif
 
 #define TRACE() DB("TRACE\n")
diff --git a/hw/xquartz/pbproxy/x-selection.h b/hw/xquartz/pbproxy/x-selection.h
index 0be8d81..7a26a21 100644
--- a/hw/xquartz/pbproxy/x-selection.h
+++ b/hw/xquartz/pbproxy/x-selection.h
@@ -32,8 +32,10 @@
 #define X_SELECTION_H 1
 
 #include "pbproxy.h"
+
+#include <X11/extensions/Xfixes.h>
+
 #include <AppKit/NSPasteboard.h>
-#include <X11/extensions/xfixes.h>
 
 /* This stores image data or text. */
 struct propdata {
diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m
index 304bee7..3cc1201 100644
--- a/hw/xquartz/pbproxy/x-selection.m
+++ b/hw/xquartz/pbproxy/x-selection.m
@@ -37,8 +37,6 @@
 #include <X11/Xutil.h>
 #import <AppKit/NSBitmapImageRep.h>
 
-#include <X11/extensions/xfixes.h>
-
 /*
  * The basic design of the pbproxy code is as follows.
  *
commit 06655dac0055226bf6cfdca5289dee7e6c53aab4
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Oct 23 14:28:50 2008 -0700

    mi: Just some formatting consistency...

diff --git a/mi/mieq.c b/mi/mieq.c
index 543b7e7..23ba11b 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -257,12 +257,12 @@ mieqProcessInputEvents(void)
         pthread_mutex_unlock(&miEventQueueMutex);
 #endif
 
-        if (miEventQueue.handlers[e.event->u.u.type]) {
+        if (miEventQueue.handlers[e.event[0].u.u.type]) {
             /* If someone's registered a custom event handler, let them
              * steal it. */
-            miEventQueue.handlers[e.event->u.u.type](e.pScreen->myNum,
-                                                      e.event, e.pDev,
-                                                      e.nevents);
+            miEventQueue.handlers[e.event[0].u.u.type](e.pScreen->myNum,
+                                                       e.event, e.pDev,
+                                                       e.nevents);
         }
         else if (e.pScreen != miEventQueue.pDequeueScreen) {
             /* Assumption - screen switching can only occur on motion events. */