[ros-diffs] [janderwald] 25581: - define msvc compabitble debug macro - fix error in debug print

Author: janderwald
Date: Mon Jan 22 02:29:12 2007
New Revision: 25581

URL: http://svn.reactos.org/svn/reactos?rev=25581&view=rev
Log:
- define msvc compabitble debug macro
- fix error in debug print

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

Modified: trunk/reactos/dll/ntdll/ldr/utils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=2...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/utils.c (original)
+++ trunk/reactos/dll/ntdll/ldr/utils.c Mon Jan 22 02:29:12 2007
@@ -29,7 +29,8 @@
 #ifdef NDEBUG
 #if defined(__GNUC__)
 #define TRACE_LDR(args...) if (RtlGetNtGlobalFlags() & FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); }
-#else
+#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)
@@ -736,7 +737,7 @@

TRACE_LDR("LdrLoadDll, loading %wZ%s%S\n",
             Name,
-            SearchPath ? " from " : "",
+            SearchPath ? L" from " : L"",
             SearchPath ? SearchPath : L"");

if (Name == NULL)