--- a/compressionlibs/ziplib/inc/zipfilememberinputstream.h	Tue Jun 15 15:32:34 2010 +0100
+++ b/compressionlibs/ziplib/inc/zipfilememberinputstream.h	Wed Jun 16 08:14:03 2010 +0100
@@ -76,7 +76,7 @@
 	RZipFileMemberReaderStream(CZipFile&, TUint32, TUint32, TUint32, TUint32);
 	
 	static RZipFileMemberReaderStream* NewL(CZipFile&, TUint32, TUint32, TUint32, TUint32);
-	void RZipFileMemberReaderStream::ConstructL();
+	void ConstructL();
 	
 	virtual TInt Read(void);
 	virtual TInt Read(TByte*, TUint32, TUint32*);

--- a/genericopenlibs/openenvcore/libc/inc/gdtoa.h	Tue Jun 15 15:32:34 2010 +0100
+++ b/genericopenlibs/openenvcore/libc/inc/gdtoa.h	Wed Jun 16 08:14:03 2010 +0100
@@ -43,7 +43,8 @@
 #ifndef Long
 #define Long long
 #endif
-#ifndef ULong
+#ifndef ULong_DEF
+#define ULong_DEF
 typedef unsigned Long ULong;
 #endif
 #ifndef UShort

--- a/genericopenlibs/openenvcore/libc/inc/gdtoatypes.h	Tue Jun 15 15:32:34 2010 +0100
+++ b/genericopenlibs/openenvcore/libc/inc/gdtoatypes.h	Wed Jun 16 08:14:03 2010 +0100
@@ -27,7 +27,8 @@
 #define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double))
 #endif
 
-#ifndef ULong
+#ifndef ULong_DEF
+#define ULong_DEF
 typedef unsigned long ULong;
 #endif