# HG changeset patch
# User Peter Fordham <peter.fordham@gmail.com>
# Date 1269287824 25200
# Node ID ef48f5dc1b7f1afe66441c7b88ba5dbbd12e6de9
# Parent  8f46d5fb6bec19cb4c71abf174f2b90dbfce818d
Bug 1713 - You can't check the existence of a typedef using the preprocessor. Added a preprocessor check. Also removed an overqualified method name.

diff -r 8f46d5fb6bec -r ef48f5dc1b7f compressionlibs/ziplib/inc/zipfilememberinputstream.h
--- a/compressionlibs/ziplib/inc/zipfilememberinputstream.h	Mon Mar 22 12:55:48 2010 -0700
+++ b/compressionlibs/ziplib/inc/zipfilememberinputstream.h	Mon Mar 22 12:57:04 2010 -0700
@@ -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*);
diff -r 8f46d5fb6bec -r ef48f5dc1b7f genericopenlibs/openenvcore/libc/inc/gdtoa.h
--- a/genericopenlibs/openenvcore/libc/inc/gdtoa.h	Mon Mar 22 12:55:48 2010 -0700
+++ b/genericopenlibs/openenvcore/libc/inc/gdtoa.h	Mon Mar 22 12:57:04 2010 -0700
@@ -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
diff -r 8f46d5fb6bec -r ef48f5dc1b7f genericopenlibs/openenvcore/libc/inc/gdtoatypes.h
--- a/genericopenlibs/openenvcore/libc/inc/gdtoatypes.h	Mon Mar 22 12:55:48 2010 -0700
+++ b/genericopenlibs/openenvcore/libc/inc/gdtoatypes.h	Mon Mar 22 12:57:04 2010 -0700
@@ -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
 
diff -r 8f46d5fb6bec -r ef48f5dc1b7f glib/libglib/src/gfileutils.c
--- a/glib/libglib/src/gfileutils.c	Mon Mar 22 12:55:48 2010 -0700
+++ b/glib/libglib/src/gfileutils.c	Mon Mar 22 12:57:04 2010 -0700
@@ -60,6 +60,8 @@
 #endif /* __SYMBIAN32__ */
 
 
+static gint create_temp_file (gchar *tmpl, int permissions);
+
 /**
  * g_mkdir_with_parents:
  * @pathname: a pathname in the GLib file name encoding