--- winex-cvs/include/wine/debug.h	Fri Apr 19 18:52:22 2002
+++ wine/include/wine/debug.h	Wed May 15 16:14:14 2002
@@ -127,17 +127,33 @@
 inline static const char *debugres_a( const char *s )  { return wine_dbgstr_an( s, 80 ); }
 inline static const char *debugres_w( const WCHAR *s ) { return wine_dbgstr_wn( s, 80 ); }
 
-#define TRACE                      WINE_TRACE
-#define TRACE_(ch)                 WINE_TRACE_(ch)
-#define TRACE_ON(ch)               WINE_TRACE_ON(ch)
+#ifndef NO_TRACE_MSGS
+#   define TRACE                      WINE_TRACE
+#   define TRACE_(ch)                 WINE_TRACE_(ch)
+#   define TRACE_ON(ch)               WINE_TRACE_ON(ch)
+#else
+#   define TRACE(...)                 do{}while(0)
+#   define TRACE_(ch)                 TRACE
+#   define TRACE_ON(ch)               (0)
+#endif
 
-#define WARN                       WINE_WARN
-#define WARN_(ch)                  WINE_WARN_(ch)
-#define WARN_ON(ch)                WINE_WARN_ON(ch)
+#ifndef NO_DEBUG_MSGS
+#   define WARN                       WINE_WARN
+#   define WARN_(ch)                  WINE_WARN_(ch)
+#   define WARN_ON(ch)                WINE_WARN_ON(ch)
 
-#define FIXME                      WINE_FIXME
-#define FIXME_(ch)                 WINE_FIXME_(ch)
-#define FIXME_ON(ch)               WINE_FIXME_ON(ch)
+#   define FIXME                      WINE_FIXME
+#   define FIXME_(ch)                 WINE_FIXME_(ch)
+#   define FIXME_ON(ch)               WINE_FIXME_ON(ch)
+#else
+#   define WARN(...)                  do{}while(0)
+#   define WARN_(ch)                  WARN
+#   define WARN_ON(ch)                (0)
+
+#   define FIXME(...)                 do{}while(0)
+#   define FIXME_(ch)                 FIXME
+#   define FIXME_ON(ch)               (0)
+#endif
 
 #undef ERR  /* Solaris got an 'ERR' define in <sys/reg.h> */
 #define ERR                        WINE_ERR