[hpoussin] 27895: Revert r27863, and add the correct fix

Author: hpoussin
Date: Fri Jul 27 11:23:34 2007
New Revision: 27895

URL: http://svn.reactos.org/svn/reactos?rev=27895&view=rev
Log:
Revert r27863, and add the correct fix

Modified:
    trunk/reactos/base/applications/winhelp/lex.yy.c
    trunk/reactos/base/applications/winhelp/winhelp.h
    trunk/reactos/include/reactos/wine/debug.h

Modified: trunk/reactos/base/applications/winhelp/lex.yy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/l...
==============================================================================
--- trunk/reactos/base/applications/winhelp/lex.yy.c (original)
+++ trunk/reactos/base/applications/winhelp/lex.yy.c Fri Jul 27 11:23:34 2007
@@ -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

Modified: trunk/reactos/base/applications/winhelp/winhelp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/w...
==============================================================================
--- trunk/reactos/base/applications/winhelp/winhelp.h (original)
+++ trunk/reactos/base/applications/winhelp/winhelp.h Fri Jul 27 11:23:34 2007
@@ -32,8 +32,6 @@
 #define SHADOW_DY               10
 #define BUTTON_CX               6
 #define BUTTON_CY               6
-
-#define WINE_WARN DPRINT

#ifndef RC_INVOKED

Modified: trunk/reactos/include/reactos/wine/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug....
==============================================================================
--- trunk/reactos/include/reactos/wine/debug.h (original)
+++ trunk/reactos/include/reactos/wine/debug.h Fri Jul 27 11:23:34 2007
@@ -101,6 +101,14 @@
 #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