diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-28 11:14:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-28 11:14:32 +0000 |
| commit | 1840c5631682e0a69ed11487a23a43d45f2d15e1 (patch) | |
| tree | fe954636044c0057b9f08e76d19489493ff09745 /xorg-server/hw/xquartz/darwin.h | |
| parent | 2ab09dc03e4ecc726ee7b5528306b0fe3e5b1837 (diff) | |
| parent | 57a879849643e79d9674198a3a77c59532fb79b4 (diff) | |
| download | vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.gz vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.bz2 vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/darwin.h')
| -rw-r--r-- | xorg-server/hw/xquartz/darwin.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h index ec9d52d97..da53a261d 100644 --- a/xorg-server/hw/xquartz/darwin.h +++ b/xorg-server/hw/xquartz/darwin.h @@ -34,8 +34,6 @@ #include <X11/extensions/XKB.h>
#include <assert.h>
-#include "threadSafety.h"
-
#include "darwinfb.h"
// From darwin.c
@@ -75,12 +73,15 @@ extern int darwinDesiredDepth; extern int darwinMainScreenX;
extern int darwinMainScreenY;
+// bundle-main.c
+extern char *bundle_id_prefix;
+
#define ENABLE_DEBUG_LOG 1
#ifdef ENABLE_DEBUG_LOG
extern FILE *debug_log_fp;
#define DEBUG_LOG_NAME "x11-debug.txt"
-#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%s:%s:%d " msg, threadSafetyID(pthread_self()), __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);
+#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);
#else
#define DEBUG_LOG(msg, args...)
#endif
|