[ros-diffs] [hyperion] 41556: modified dll/ntdll/include/ntdll.h Explicitly include <pseh/pseh2.h> modified dll/ntdll/ldr/utils.c Use ANSI C variadic macros, instead of hacks ntdll now compiles with Visual C++

[hyperion at svn.reactos.org]

Author: hyperion
Date: Tue Jun 23 00:00:38 2009
New Revision: 41556

URL: http://svn.reactos.org/svn/reactos?rev=41556&view=rev
Log:
modified   dll/ntdll/include/ntdll.h
   Explicitly include <pseh/pseh2.h>

modified   dll/ntdll/ldr/utils.c
   Use ANSI C variadic macros, instead of hacks

ntdll now compiles with Visual C++

Modified:
    trunk/reactos/dll/ntdll/include/ntdll.h
    trunk/reactos/dll/ntdll/ldr/utils.c

Modified: trunk/reactos/dll/ntdll/include/ntdll.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?rev=41556&r1=41555&r2=41556&view=diff
==============================================================================
--- trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] Tue Jun 23 00:00:38 2009
@@ -32,4 +32,7 @@
 /* CSRSS Header */
 #include <csrss/csrss.h>
 
+/* PSEH */
+#include <pseh/pseh2.h>
+
 /* EOF */

Modified: trunk/reactos/dll/ntdll/ldr/utils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=41556&r1=41555&r2=41556&view=diff
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Tue Jun 23 00:00:38 2009
@@ -27,13 +27,7 @@
 /* GLOBALS *******************************************************************/
 
 #ifdef NDEBUG
-#if defined(__GNUC__)
-#define TRACE_LDR(args...) if (RtlGetNtGlobalFlags() & FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); }
-#elif defined(_MSC_VER)
-#define TRACE_LDR(args, ...) if (RtlGetNtGlobalFlags() & FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); }
-#endif	/* __GNUC__ */
-#else
-#define TRACE_LDR(args...) do { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0)
+#define TRACE_LDR(...) if (RtlGetNtGlobalFlags() & FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); }
 #endif
 
 typedef struct _TLS_DATA