# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269861976 -3600
# Node ID 10eb901904341344b42135fd025b57f8e286ada2
# Parent  425e2276aed4e4ff23d8d26e44e10c9dd779ca2e# Parent  0d694d202b823005dee4fba5299b4565369fc738
Merge.

diff -r 0d694d202b82 -r 10eb90190434 coreapplicationuis/Rfs/inc/rfsShutdown.h
--- 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();
 
diff -r 0d694d202b82 -r 10eb90190434 coreapplicationuis/SysAp/Inc/SysApAppUi.h
--- 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
 
diff -r 0d694d202b82 -r 10eb90190434 coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/trace.h
--- 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
diff -r 0d694d202b82 -r 10eb90190434 coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h
--- 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
diff -r 0d694d202b82 -r 10eb90190434 coreapplicationuis/powersaveutilities/bsutil/inc/trace.h
--- 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
diff -r 0d694d202b82 -r 10eb90190434 openenvutils/commandshell/shell/commands/cp/src/cp.c
--- 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",
diff -r 0d694d202b82 -r 10eb90190434 openenvutils/commandshell/shell/commands/ls/src/ls.c
--- 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()
 {
diff -r 0d694d202b82 -r 10eb90190434 openenvutils/commandshell/shell/commands/touch/src/touch.c
--- 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,
diff -r 0d694d202b82 -r 10eb90190434 openenvutils/commandshell/shell/commands/unzip/inc/common.h
--- 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