Re-merge fix for bug 2611 RCL_3
authorWilliam Roberts <williamr@symbian.org>
Fri, 28 May 2010 15:24:52 +0100
branchRCL_3
changeset 24 b9e98a1244ee
parent 23 23b59305592d (current diff)
parent 22 593fb613234e (diff)
child 35 f44b73583a2f
Re-merge fix for bug 2611
--- a/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Tue May 25 14:22:18 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Fri May 28 15:24:52 2010 +0100
@@ -34,7 +34,9 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY     	euser.lib efsrv.lib 
-LIBRARY		cinidata.lib
+// darios: cinidata is deprecated, see bug #1894
+//LIBRARY		cinidata.lib
+LIBRARY		IniParser.lib
 
 epocheapsize  1000 6000000
 CAPABILITY All -Tcb
--- a/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Tue May 25 14:22:18 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Fri May 28 15:24:52 2010 +0100
@@ -26,7 +26,9 @@
 #if (!defined __TESTSTEP_H__)
 #define __TESTSTEP_H__
 
-#include "cinidata.h"
+// darios: cinidata is deprecated, see bug #1894
+//#include "cinidata.h"
+#include <iniparser.h>
 #include "networking/log.h"
 
 class CTestSuite;