summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-05-27 13:49:40 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-05-27 13:49:40 +0000
commit9afe489dff85e9e13608e70625c05be8f68f4972 (patch)
treecbd4e58e645dff1d6596214f04225522c1e2bb29
parent291d2f8e981039eb8812ab7bfc4cb9cdbdd2c128 (diff)
Make debug conditionals definable in Makefiles
-rw-r--r--hw/xfree86/int10/x86emu.c12
-rw-r--r--hw/xwin/ChangeLog5
-rw-r--r--hw/xwin/win.h2
-rw-r--r--hw/xwin/winwindow.h4
4 files changed, 23 insertions, 0 deletions
diff --git a/hw/xfree86/int10/x86emu.c b/hw/xfree86/int10/x86emu.c
new file mode 100644
index 000000000..2d0faa603
--- /dev/null
+++ b/hw/xfree86/int10/x86emu.c
@@ -0,0 +1,12 @@
+
+#ifdef NO_SYS_HEADERS
+# include "xf86_ansic.h"
+#endif
+
+#include "debug.c"
+#include "decode.c"
+#include "fpu.c"
+#include "ops.c"
+#include "ops2.c"
+#include "prim_ops.c"
+#include "sys.c"
diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 9abc7161d..8871430b5 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-27 Alexander Gottwald <ago@freedesktop.org>
+
+ * win.h: Allow CYGDEBUG to defined in the Makefile
+ * winwindow.h: Allow CYGWINDOWING_DEBUG to defined in the Makefile
+
2004-05-19 Alexander Gottwald <ago@freedesktop.org>
* winmultiwindowicons.c (winInitGlobalIcons): Load the small default
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 54ddae354..46ccb7884 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -44,7 +44,9 @@
#endif
/* Turn debug messages on or off */
+#ifndef CYGDEBUG
#define CYGDEBUG NO
+#endif
#define NEED_EVENTS
diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h
index 50d5f01fb..b4a92187a 100644
--- a/hw/xwin/winwindow.h
+++ b/hw/xwin/winwindow.h
@@ -50,8 +50,12 @@
#define WIN_WID_PROP "cyg_wid_prop_rl"
#define WIN_NEEDMANAGE_PROP "cyg_override_redirect_prop_rl"
#define WIN_HWND_CACHE "cyg_privmap_rl"
+#ifndef CYGMULTIWINDOW_DEBUG
#define CYGMULTIWINDOW_DEBUG NO
+#endif
+#ifndef CYGWINDOWING_DEBUG
#define CYGWINDOWING_DEBUG NO
+#endif
typedef struct _winPrivScreenRec *winPrivScreenPtr;