# HG changeset patch # User Pat Downey # Date 1274199192 -3600 # Node ID 593fb613234eef99efde3e85ebbed6a8cf97462d # Parent 2129f10626bacad1be65824f630d0580c4b8dad8# Parent 75c06c88bfa367e9812b4084d1f07bb0d966f831 Re-merge fix for bug 2611. diff -r 2129f10626ba -r 593fb613234e networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp --- a/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp Tue May 11 17:38:48 2010 +0300 +++ b/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp Tue May 18 17:13:12 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 diff -r 2129f10626ba -r 593fb613234e networkingtestandutils/networkingintegrationtest/inc/TestStep.h --- a/networkingtestandutils/networkingintegrationtest/inc/TestStep.h Tue May 11 17:38:48 2010 +0300 +++ b/networkingtestandutils/networkingintegrationtest/inc/TestStep.h Tue May 18 17:13:12 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 #include "networking/log.h" class CTestSuite;