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.
--- 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();
--- 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
--- 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
--- 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
--- 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
--- 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