XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
(cherry picked from commit 6622efca216663c99d112c7a226bde691d1f3215)
This commit is contained in:
parent
40f9b6bf0d
commit
28d4f71193
|
@ -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;
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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.
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue