--- a/usbengines/usbotgwatcher/inc/debug.h Fri Jun 11 16:27:05 2010 +0100
+++ b/usbengines/usbotgwatcher/inc/debug.h Tue Jun 15 14:56:44 2010 +0100
@@ -102,11 +102,11 @@
// Paramters same as above.
#define LOG( str ) { RDebug::Printf( "["MODULE_NAME"] %s", str ); }
-#define LOG1( s, v ) { RDebug::Printf( "["MODULE_NAME"] "##s , v ); }
+#define LOG1( s, v ) { RDebug::Printf( "["MODULE_NAME"] " s , v ); }
-#define LOG2( s, v1,v2 ) { RDebug::Printf( "["MODULE_NAME"] "##s , v1, v2 ); }
+#define LOG2( s, v1,v2 ) { RDebug::Printf( "["MODULE_NAME"] " s , v1, v2 ); }
-#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "["MODULE_NAME"] "##s , \
+#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "["MODULE_NAME"] " s , \
v1, v2, v3); }
class TFuncLogger
--- a/usbengines/usbwatcher/inc/debug.h Fri Jun 11 16:27:05 2010 +0100
+++ b/usbengines/usbwatcher/inc/debug.h Tue Jun 15 14:56:44 2010 +0100
@@ -109,13 +109,13 @@
#define LOG( str ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] %s",\
TUint(RThread().Id()), str ); }
-#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s ,\
+#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s ,\
TUint(RThread().Id()), v ); }
-#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s , \
+#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s , \
TUint(RThread().Id()), v1, v2 ); }
-#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s, \
+#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s, \
TUint(RThread().Id()), v1, v2, v3); }
class TFuncLogger