diff -r 000000000000 -r 71ca22bcf22a mmserv/callaudiocontrol/inc/CallAudioControlCommon.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mmserv/callaudiocontrol/inc/CallAudioControlCommon.h	Tue Feb 02 01:08:46 2010 +0200
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Defines the common definitions used in CallAudioControl
+*
+*/
+
+#ifndef CALLAUDIOCONTROLCOMMON_H
+#define CALLAUDIOCONTROLCOMMON_H
+
+// In debug binaries, print debug traces, else do nothing
+#ifdef _DEBUG
+
+#include <e32debug.h>
+
+#define CAC_TRACE1(str) \
+    RDebug::Print(str)
+#define CAC_TRACE2(str,val1) \
+    RDebug::Print(str,val1)
+#define CAC_TRACE3(str,val1,val2) \
+    RDebug::Print(str,val1,val2)
+#define CAC_TRACE4(str,val1,val2,val3) \
+    RDebug::Print(str,val1,val2,val3)
+#define CAC_TRACE5(str,val1,val2,val3,val4) \
+    RDebug::Print(str,val1,val2,val3,val4)
+#define CAC_TRACE6(str,val1,val2,val3,val4,val5) \
+    RDebug::Print(str,val1,val2,val3,val4,val5)
+#else
+#define CAC_TRACE1(str)
+#define CAC_TRACE2(str,val1)
+#define CAC_TRACE3(str,val1,val2)
+#define CAC_TRACE4(str,val1,val2,val3)
+#define CAC_TRACE5(str,val1,val2,val3,val4)
+#define CAC_TRACE6(str,val1,val2,val3,val4,val5)
+#endif // _DEBUG
+
+#define RETURN_IF_ERROR(s) if (s != KErrNone) return s;
+
+#endif /* CALLAUDIOCONTROLCOMMON_H_ */