# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1279037633 -3600
# Node ID 87bcfc2c9c1ece29ff58f3b796e01201c5af847c
# Parent  d566d76acea1cb16feae948fc3210c3d80641c19# Parent  f44b73583a2fd038cc3d14dd9209981e2345370f
Merge fixes for bug 1894 and bug 3108.

diff -r d566d76acea1 -r 87bcfc2c9c1e linklayercontrol/networkinterfacemgr/group/BLD.INF
--- a/linklayercontrol/networkinterfacemgr/group/BLD.INF	Mon Jun 21 17:25:18 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/group/BLD.INF	Tue Jul 13 17:13:53 2010 +0100
@@ -94,6 +94,9 @@
 ../inc/cfbearers.h 							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/cfbearers.h)
 #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
+// Bug 3108, required to build sf_refhw image
+NetCfgExtnBase.iby              /epoc32/rom/include/NetCfgExtnBase.iby
+
 PRJ_MMPFILES
 
 NIFMAN.MMP        
diff -r d566d76acea1 -r 87bcfc2c9c1e networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp
--- a/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Mon Jun 21 17:25:18 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Tue Jul 13 17:13:53 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 d566d76acea1 -r 87bcfc2c9c1e networkingtestandutils/networkingintegrationtest/inc/TestStep.h
--- a/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Mon Jun 21 17:25:18 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Tue Jul 13 17:13:53 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;