2 files changed, 19 insertions, 3 deletions
diff --git a/src/libw32dll/wine/debugtools.h b/src/libw32dll/wine/debugtools.h
index ef86580af..038c05309 100644
--- a/src/libw32dll/wine/debugtools.h
+++ b/src/libw32dll/wine/debugtools.h
@@ -12,13 +12,21 @@
 
 struct _GUID;
 
+#ifndef TRACE
 #ifdef LOG
 #  define TRACE __vprintf
-#  define dbg_printf __vprintf
 #else
 #  define TRACE(...)
+#endif
+#endif
+
+#ifndef dbg_printf
+#ifdef LOG
+#  define dbg_printf __vprintf
+#else
 #  define dbg_printf(...)
 #endif
+#endif
 
 /* Internal definitions (do not use these directly) */
 
diff --git a/src/libw32dll/wine/module.c b/src/libw32dll/wine/module.c
index a1d281cde..2c7ddc454 100644
--- a/src/libw32dll/wine/module.c
+++ b/src/libw32dll/wine/module.c
@@ -144,8 +144,12 @@ static WIN_BOOL MODULE_InitDll( WINE_MODREF *wm, DWORD type, LPVOID lpReserved )
         return TRUE;
 
 
+#ifdef LOG
     TRACE("(%s,%s,%p) - CALL\n", wm->modname, typeName[type], lpReserved );
-
+#else
+    TRACE("(%s,%p) - CALL\n", wm->modname, lpReserved );
+#endif
+    
     /* Call the initialization routine */
     switch ( wm->type )
     {
@@ -166,8 +170,12 @@ static WIN_BOOL MODULE_InitDll( WINE_MODREF *wm, DWORD type, LPVOID lpReserved )
     /* The state of the module list may have changed due to the call
        to PE_InitDLL. We cannot assume that this module has not been
        deleted.  */
+#ifdef LOG
     TRACE("(%p,%s,%p) - RETURN %d\n", wm, typeName[type], lpReserved, retv );
-
+#else
+    TRACE("(%p,%p) - RETURN %d\n", wm, lpReserved, retv );
+#endif
+    
     return retv;
 }