FCL/sf/app/conntools: changeset 10:6a42f6e73436

author	William Roberts <williamr@symbian.org>
	Sun, 14 Mar 2010 13:08:23 +0000
branch	CompilerCompatibility
changeset 10	6a42f6e73436
parent 8	b78b45177ad9 (current diff)
parent 7	cc5042a680fb (diff)
child 13	06885b2d8fbf

Automatic merge from PDK_3.0.h

--- a/emulatorlan/group/bld.inf	Mon Mar 08 21:43:01 2010 +0000
+++ b/emulatorlan/group/bld.inf	Sun Mar 14 13:08:23 2010 +0000
@@ -21,7 +21,7 @@
 PRJ_EXPORTS
 ../data/configchange.pl             /epoc32/tools/configchange.pl
 ../data/EnableLanConnection.cmd     /epoc32/tools/EnableLanConnection.cmd
-../data/ethernetced.xml             /epoc32/winscw/c/ethernetced.xml
+../data/ethernetced.xml             /epoc32/winscw/c/ethernetced_conntools.xml
 ../data/s60_32_default_snaps.xml    /epoc32/winscw/c/s60_32_default_snaps.xml
 
 PRJ_MMPFILES

--- a/nettools/conntest/probe/inc/prt.h	Mon Mar 08 21:43:01 2010 +0000
+++ b/nettools/conntest/probe/inc/prt.h	Sun Mar 14 13:08:23 2010 +0000
@@ -19,6 +19,7 @@
 #define __PROBE_PRT_H
 
 #include <e32std.h>
+#include <f32file.h>
 #include <es_sock.h>
 #include <nifman.h>
 #include <in_bind.h>