diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-23 12:38:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-23 12:38:03 +0000 |
| commit | 98a78a31883c4b5d63dd1465b4208bcc7c12bfcb (patch) | |
| tree | fdb125ad89bd8b0fae5c3580558989367f666f2b /xorg-server/hw/xquartz/darwin.h | |
| parent | 215417a52a66f9a2252c64f24e417297eba2331f (diff) | |
| parent | ae87f2594b9439cb63a6b52e42e09504b687aea3 (diff) | |
| download | vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.tar.gz vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.tar.bz2 vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.zip | |
merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/darwin.h')
| -rw-r--r-- | xorg-server/hw/xquartz/darwin.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h index da53a261d..e9b6efd9a 100644 --- a/xorg-server/hw/xquartz/darwin.h +++ b/xorg-server/hw/xquartz/darwin.h @@ -32,7 +32,7 @@ #include "inputstr.h"
#include "scrnintstr.h"
#include <X11/extensions/XKB.h>
-#include <assert.h>
+#include <asl.h>
#include "darwinfb.h"
@@ -76,16 +76,9 @@ extern int darwinMainScreenY; // bundle-main.c
extern char *bundle_id_prefix;
-#define ENABLE_DEBUG_LOG 1
+extern void debug_asl (const char *file, const char *function, int line, const char *fmt, ...) _X_ATTRIBUTE_PRINTF(4,5);
-#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:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);
-#else
-#define DEBUG_LOG(msg, args...)
-#endif
-
-#define TRACE() DEBUG_LOG("\n")
+#define DEBUG_LOG(msg, args...) debug_asl(__FILE__, __FUNCTION__, __LINE__, msg, ##args);
+#define TRACE() DEBUG_LOG("TRACE")
#endif /* _DARWIN_H */
|