From e95c6843c00eb9ce6b324e883c9164a4da611034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Fri, 27 Jul 2007 07:23:34 +0000
Subject: [PATCH] Revert r27863, and add the correct fix

svn path=/trunk/; revision=27895
---
 reactos/base/applications/winhelp/lex.yy.c  | 2 +-
 reactos/base/applications/winhelp/winhelp.h | 2 --
 reactos/include/reactos/wine/debug.h        | 8 ++++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/reactos/base/applications/winhelp/lex.yy.c b/reactos/base/applications/winhelp/lex.yy.c
index a95b98a4988..0f38be750f1 100644
--- a/reactos/base/applications/winhelp/lex.yy.c
+++ b/reactos/base/applications/winhelp/lex.yy.c
@@ -9,7 +9,7 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
-#define WINE_WARN DPRINT
+
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
 #ifdef c_plusplus
diff --git a/reactos/base/applications/winhelp/winhelp.h b/reactos/base/applications/winhelp/winhelp.h
index b49324c63ae..419880b5c5f 100644
--- a/reactos/base/applications/winhelp/winhelp.h
+++ b/reactos/base/applications/winhelp/winhelp.h
@@ -33,8 +33,6 @@
 #define BUTTON_CX               6
 #define BUTTON_CY               6
 
-#define WINE_WARN DPRINT
-
 #ifndef RC_INVOKED
 
 #include <stdarg.h>
diff --git a/reactos/include/reactos/wine/debug.h b/reactos/include/reactos/wine/debug.h
index 6f4c93b98bd..8a85081d082 100644
--- a/reactos/include/reactos/wine/debug.h
+++ b/reactos/include/reactos/wine/debug.h
@@ -101,6 +101,14 @@ static inline const char *debugstr_guid( const struct _GUID *id ) { return wine_
 #define WARN_ON(ch)  1
 #endif
 
+#define WINE_WARN         DPRINT
+#define WINE_WARN_(ch)    DPRINT
+#ifdef NDEBUG
+#define WINE_WARN_ON(ch) 0
+#else
+#define WINE_WARN_ON(ch) 1
+#endif
+
 #ifdef FIXME
 #undef FIXME
 #endif