| author | Stefan Karlsson <stefan.karlsson@nokia.com> |
| Mon, 29 Mar 2010 12:26:16 +0100 | |
| branch | CompilerCompatibility |
| changeset 14 | 10eb90190434 |
| parent 11 | 425e2276aed4 (diff) |
| parent 8 | 0d694d202b82 (current diff) |
| child 15 | c7a26f90fc56 |
--- a/coreapplicationuis/Rfs/inc/rfsShutdown.h Sun Mar 14 13:10:20 2010 +0000 +++ b/coreapplicationuis/Rfs/inc/rfsShutdown.h Mon Mar 29 12:26:16 2010 +0100 @@ -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 Sun Mar 14 13:10:20 2010 +0000 +++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h Mon Mar 29 12:26:16 2010 +0100 @@ -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 Sun Mar 14 13:10:20 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/trace.h Mon Mar 29 12:26:16 2010 +0100 @@ -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 Sun Mar 14 13:10:20 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h Mon Mar 29 12:26:16 2010 +0100 @@ -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 Sun Mar 14 13:10:20 2010 +0000 +++ b/coreapplicationuis/powersaveutilities/bsutil/inc/trace.h Mon Mar 29 12:26:16 2010 +0100 @@ -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/cp/src/cp.c Sun Mar 14 13:10:20 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/cp/src/cp.c Mon Mar 29 12:26:16 2010 +0100 @@ -564,7 +564,7 @@ return (0); } -static void +void usage() { (void)fprintf(stderr, "%s\n%s\n",
--- a/openenvutils/commandshell/shell/commands/ls/src/ls.c Sun Mar 14 13:10:20 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/ls/src/ls.c Mon Mar 29 12:26:16 2010 +0100 @@ -693,7 +693,6 @@ } -static void usage() {
--- a/openenvutils/commandshell/shell/commands/touch/src/touch.c Sun Mar 14 13:10:20 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/touch/src/touch.c Mon Mar 29 12:26:16 2010 +0100 @@ -407,7 +407,7 @@ return (rval); } -static void +void usage() { (void)fprintf(stderr,
--- a/openenvutils/commandshell/shell/commands/unzip/inc/common.h Sun Mar 14 13:10:20 2010 +0000 +++ b/openenvutils/commandshell/shell/commands/unzip/inc/common.h Mon Mar 29 12:26:16 2010 +0100 @@ -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