--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugindebug.h Tue Sep 28 14:14:01 2010 +0300
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamplugindebug.h Wed Oct 13 13:08:34 2010 +0300
@@ -89,7 +89,7 @@
User::Panic(aPanicCategory, aPanicCode);
}
-inline void TraceLeave(char* aFile, TInt aLine, TInt aReason)
+inline void TraceLeaveL(char* aFile, TInt aLine, TInt aReason)
{
TPtrC8 fullFileName((const TUint8*)aFile);
TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
@@ -114,11 +114,11 @@
#define PANIC(CODE) TracePanic(__FILE__, __LINE__, CODE, KPanicCategory)
-#define LEAVE_IF_ERROR(REASON) {if (REASON) TraceLeave(__FILE__, __LINE__, REASON);}
+#define LEAVE_IF_ERROR(REASON) {if (REASON) TraceLeaveL(__FILE__, __LINE__, REASON);}
-#define LEAVE_IF_NULL(PTR) {if (!PTR) TraceLeave(__FILE__, __LINE__, PTR);}
+#define LEAVE_IF_NULL(PTR) {if (!PTR) TraceLeaveL(__FILE__, __LINE__, PTR);}
-#define LEAVE(REASON) {TraceLeave(__FILE__, __LINE__, REASON);}
+#define LEAVE(REASON) {TraceLeaveL(__FILE__, __LINE__, REASON);}
#define TRACE_STATIC_FUNC_ENTRY {if(KTraceMask & KPRINTINFO) { TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); Trace(KFuncEntryFormat8, &ptr8);}}