summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-06-01 21:06:08 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-06-01 21:18:44 -0700
commit19020b23efa15d72349bd833aebddcc64780a615 (patch)
tree2e55ec4e292feed07fb2d52878336e535bde2db2
parenta66400f8dba9b7c5b65f9d26996fff677c42d866 (diff)
XQuartz: ASL: Use xpr subsystem for logging xpr messages
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--hw/xquartz/xpr/xpr.h5
-rw-r--r--hw/xquartz/xpr/xprCursor.c1
-rw-r--r--hw/xquartz/xpr/xprEvent.c1
-rw-r--r--hw/xquartz/xpr/xprScreen.c1
4 files changed, 5 insertions, 3 deletions
diff --git a/hw/xquartz/xpr/xpr.h b/hw/xquartz/xpr/xpr.h
index ebd89de3a..0b138ddd7 100644
--- 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);
diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index 216678e24..2b31865a5 100644
--- 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>
diff --git a/hw/xquartz/xpr/xprEvent.c b/hw/xquartz/xpr/xprEvent.c
index cc86c473d..4e7ece64f 100644
--- 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"
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 98250e641..002355eca 100644
--- 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"