diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-10-23 15:01:03 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-10-23 16:30:53 -0700 |
| commit | 28d4f71193d2be26d1dcae724067539ac9db1123 (patch) | |
| tree | c0a9b5e99ff6e2c1f48009f3a5b03af087e4b2f7 /hw/xquartz/pbproxy | |
| parent | 40f9b6bf0dc62098680235a958e0733770902cca (diff) | |
XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
(cherry picked from commit 6622efca216663c99d112c7a226bde691d1f3215)
Diffstat (limited to 'hw/xquartz/pbproxy')
| -rw-r--r-- | hw/xquartz/pbproxy/main.m | 1 | ||||
| -rw-r--r-- | hw/xquartz/pbproxy/pbproxy.h | 11 | ||||
| -rw-r--r-- | hw/xquartz/pbproxy/x-selection.h | 4 | ||||
| -rw-r--r-- | hw/xquartz/pbproxy/x-selection.m | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/hw/xquartz/pbproxy/main.m b/hw/xquartz/pbproxy/main.m index 231b2120d..f023eee18 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 1b0ed2bd6..324d56cd0 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 0be8d8130..7a26a210f 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 304bee710..3cc1201d5 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. * |