2004-09-23 Casper S. Hornstrup <chorns@users.sourceforge.net>

	* lib/msafd/makefile (TARGET_CFLAGS): Don't define DBG.
	* lib/msafd/include/debug.h: Redefine ASSERT.

svn path=/trunk/; revision=11013

diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index 6ec022e..342bc54 100644 (file)
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-23  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+       * lib/msafd/makefile (TARGET_CFLAGS): Don't define DBG.
+       * lib/msafd/include/debug.h: Redefine ASSERT.
+
 2004-08-25  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
        * tools/cdmake/cdmake.c: Error out if extension is too long.

diff --git a/reactos/lib/msafd/include/debug.h b/reactos/lib/msafd/include/debug.h
index aff92db..a4eb8fe 100644 (file)
--- a/reactos/lib/msafd/include/debug.h
+++ b/reactos/lib/msafd/include/debug.h
@@ -18,6 +18,10 @@
 #define DEBUG_CHECK    0x00000100
 #define DEBUG_ULTRA    0xFFFFFFFF
 
+#ifdef ASSERT
+#undef ASSERT
+#endif
+
 #ifdef DBG
 
 extern DWORD DebugTraceLevel;
@@ -29,10 +33,6 @@ extern DWORD DebugTraceLevel;
                DbgPrint _x_; \
     }
 
-#ifdef ASSERT
-#undef ASSERT
-#endif
-
 #ifdef NASSERT
 #define ASSERT(x)
 #else /* NASSERT */

diff --git a/reactos/lib/msafd/makefile b/reactos/lib/msafd/makefile
index 075bec5..a7c69ec 100644 (file)
--- a/reactos/lib/msafd/makefile
+++ b/reactos/lib/msafd/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.15 2004/07/18 22:49:17 arty Exp $
+# $Id: makefile,v 1.16 2004/09/23 20:05:32 chorns Exp $
 
 PATH_TO_TOP = ../..
 
@@ -16,7 +16,6 @@ TARGET_CFLAGS = \
  -Werror \
  -fno-builtin \
  -DUNICODE \
- -DDBG \
  -D__USE_W32API
 
 TARGET_LFLAGS = -nostartfiles -nostdlib