XQuartz: ASL: Use xpr subsystem for logging xpr messages

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:06:08 -07:00 · 2011-06-01 21:06:08 -07:00 · 19020b23ef
commit 19020b23ef
parent a66400f8db
4 changed files with 5 additions and 3 deletions
--- a/hw/xquartz/xpr/xpr.h
+++ b/hw/xquartz/xpr/xpr.h
@ -33,6 +33,11 @@
 #include "screenint.h"
 #include <Xplugin.h>

+#include "darwin.h"
+
+#undef DEBUG_LOG
+#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpr", msg, ##args)
+
 Bool QuartzModeBundleInit(void);

 void AppleDRIExtensionInit(void);
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@ -37,7 +37,6 @@

 #include "quartz.h"
 #include "xpr.h"
-#include "darwin.h"
 #include "darwinEvents.h"
 #include <Xplugin.h>

--- a/hw/xquartz/xpr/xprEvent.c
+++ b/hw/xquartz/xpr/xprEvent.c
@ -44,7 +44,6 @@
 #include   "scrnintstr.h"
 #include   "mipointer.h"

-#include "darwin.h"
 #include "quartz.h"
 #include "quartzKeyboard.h"
 #include "darwinEvents.h"
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@ -40,7 +40,6 @@
 #include "xpr.h"
 #include "xprEvent.h"
 #include "pseudoramiX.h"
-#include "darwin.h"
 #include "darwinEvents.h"
 #include "rootless.h"
 #include "dri.h"