update for HEAD-2003091401

[reactos.git] / lib / user32 / include / debug.h

diff --git a/lib/user32/include/debug.h b/lib/user32/include/debug.h
index dc957fc..c86cfac 100644 (file)
--- a/lib/user32/include/debug.h
+++ b/lib/user32/include/debug.h
@@ -20,6 +20,10 @@
 #define DEBUG_WINDOW   0x00000400
 #define DEBUG_ULTRA    0xFFFFFFFF
 
+#ifdef ASSERT
+#undef ASSERT
+#endif
+
 #ifdef DBG
 
 extern DWORD DebugTraceLevel;
@@ -31,10 +35,6 @@ extern DWORD DebugTraceLevel;
                    DbgPrint _x_; \
     }
 
-#ifdef ASSERT
-#undef ASSERT
-#endif
-
 #ifdef NASSERT
 #define ASSERT(x)
 #else /* NASSERT */
@@ -52,7 +52,9 @@ extern DWORD DebugTraceLevel;
 
 #endif /* DBG */
 
-
+#ifdef assert
+#undef assert
+#endif
 #define assert(x) ASSERT(x)
 #define assert_irql(x) ASSERT_IRQL(x)