# HG changeset patch
# User Peter Fordham <peter.fordham@gmail.com>
# Date 1269030453 25200
# Node ID 425e2276aed4e4ff23d8d26e44e10c9dd779ca2e
# Parent  b19595f53fffb9bc1210bb123762ee8450d922ff
Bug 1699 - Fix redefinition of uInt by replacing 2nd def with inclusion of 1st. Also fixed numerous other over qualification of method name and token pasting issues which cause GCCE errors.

diff -r b19595f53fff -r 425e2276aed4 coreapplicationuis/Rfs/inc/rfsShutdown.h
--- a/coreapplicationuis/Rfs/inc/rfsShutdown.h	Fri Mar 19 13:24:56 2010 -0700
+++ b/coreapplicationuis/Rfs/inc/rfsShutdown.h	Fri Mar 19 13:27:33 2010 -0700
@@ -38,7 +38,7 @@
         /**
         * Two-phased constructor.
         */
-        static CRfsShutdown* CRfsShutdown::NewL( TInt aPriority );
+        static CRfsShutdown* NewL( TInt aPriority );
 
         ~CRfsShutdown();
 
diff -r b19595f53fff -r 425e2276aed4 coreapplicationuis/SysAp/Inc/SysApAppUi.h
--- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Fri Mar 19 13:24:56 2010 -0700
+++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Fri Mar 19 13:27:33 2010 -0700
@@ -1423,7 +1423,7 @@
         * @since S60 3.2
         * @return reference to CSysApCenRepLogsObserver object
         */
-        CSysApCenRepLogsObserver& CSysApAppUi::LogsObserverL();
+        CSysApCenRepLogsObserver& LogsObserverL();
 
     private: //Data members
 
diff -r b19595f53fff -r 425e2276aed4 coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/trace.h
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/trace.h	Fri Mar 19 13:24:56 2010 -0700
+++ b/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/trace.h	Fri Mar 19 13:27:33 2010 -0700
@@ -51,7 +51,7 @@
 /**
 * Prefix macro for strings
 */
-#define _PREFIX_CHAR( aMsg ) (const char*)"[BatIndicatorPanePlugin]: " ##aMsg
+#define _PREFIX_CHAR( aMsg ) (const char*)"[BatIndicatorPanePlugin]: " aMsg
 
 /**
 * Define needed directories if TRACE_INTO_FILE macro in use
diff -r b19595f53fff -r 425e2276aed4 coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h	Fri Mar 19 13:24:56 2010 -0700
+++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h	Fri Mar 19 13:27:33 2010 -0700
@@ -51,7 +51,7 @@
 /**
 * Prefix macro for strings
 */
-#define _PREFIX_CHAR( aMsg ) (const char*)"[BatteryPopupControl]: " ##aMsg
+#define _PREFIX_CHAR( aMsg ) (const char*)"[BatteryPopupControl]: " aMsg
 
 /**
 * Define needed directories if TRACE_INTO_FILE macro in use
diff -r b19595f53fff -r 425e2276aed4 coreapplicationuis/powersaveutilities/bsutil/inc/trace.h
--- a/coreapplicationuis/powersaveutilities/bsutil/inc/trace.h	Fri Mar 19 13:24:56 2010 -0700
+++ b/coreapplicationuis/powersaveutilities/bsutil/inc/trace.h	Fri Mar 19 13:27:33 2010 -0700
@@ -51,7 +51,7 @@
 /**
 * Prefix macro for strings
 */
-#define _PREFIX_CHAR( aMsg ) (const char*)"[BSUtil]: " ##aMsg
+#define _PREFIX_CHAR( aMsg ) (const char*)"[BSUtil]: " aMsg
 
 /**
 * Define needed directories if TRACE_INTO_FILE macro in use
diff -r b19595f53fff -r 425e2276aed4 openenvutils/commandshell/shell/commands/unzip/inc/common.h
--- a/openenvutils/commandshell/shell/commands/unzip/inc/common.h	Fri Mar 19 13:24:56 2010 -0700
+++ b/openenvutils/commandshell/shell/commands/unzip/inc/common.h	Fri Mar 19 13:27:33 2010 -0700
@@ -25,9 +25,8 @@
 #ifndef _COMMON_H_
 #define _COMMON_H_
 
-typedef unsigned long uLong;
-typedef unsigned int  uInt;
-
+// Get definitions of uInt and uLong
+#include "zconf.h"
 
 #define unix