From 2cdaa146f7027ded7e691078bb473052cae6efa5 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Mon, 22 Jun 2009 20:00:38 +0000
Subject: [PATCH] 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++

svn path=/trunk/; revision=41556
---
 reactos/dll/ntdll/include/ntdll.h | 3 +++
 reactos/dll/ntdll/ldr/utils.c     | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/reactos/dll/ntdll/include/ntdll.h b/reactos/dll/ntdll/include/ntdll.h
index e85d5c5ffb6..6c05a3e9d35 100644
--- a/reactos/dll/ntdll/include/ntdll.h
+++ b/reactos/dll/ntdll/include/ntdll.h
@@ -32,4 +32,7 @@
 /* CSRSS Header */
 #include <csrss/csrss.h>
 
+/* PSEH */
+#include <pseh/pseh2.h>
+
 /* EOF */
diff --git a/reactos/dll/ntdll/ldr/utils.c b/reactos/dll/ntdll/ldr/utils.c
index 83c5bbb7319..7c231ab0cf2 100644
--- a/reactos/dll/ntdll/ldr/utils.c
+++ b/reactos/dll/ntdll/ldr/utils.c
@@ -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