diff options
author | marha <marha@users.sourceforge.net> | 2011-05-23 12:30:27 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-05-23 12:30:27 +0000 |
commit | ae87f2594b9439cb63a6b52e42e09504b687aea3 (patch) | |
tree | a0a59232ccde314cb2032d2856f1eb3b8701d3f8 /xorg-server/hw/xquartz/darwin.h | |
parent | 52011cfedaa930d61d8f60b283a2051093727582 (diff) | |
download | vcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.tar.gz vcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.tar.bz2 vcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.zip |
xserver git update 23 May 2011
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 507c6f7f6..659de432c 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 */ |