## diff generated by diff_upstream.pl

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/library/library.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/library/library.cpp	2010-05-13 19:14:19.380581789 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.cpp	2010-05-12 14:13:31.601098351 +0100

@@ -25,6 +25,7 @@

 #include <iostream>

 #include <iomanip>

 #include <cstdlib>

+#include <cstring>

 namespace

 {

@@ -52,7 +53,7 @@

     m_mem_p = new char[size];

     file.seekg(0, std::ios::beg);

-    file.read( const_cast<char*>(m_mem_p), size );

+	file.read(m_mem_p, size );

     file.close();

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/library/library.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.h

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/library/library.h	2010-05-13 19:14:19.380581789 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.h	2010-05-12 14:13:33.625600203 +0100

@@ -39,11 +39,12 @@

     const char* _eat_obj_header(const char*, const char*, unsigned long*, const char* = 0) const;

 private:

-    const char* m_mem_p;

+	char * m_mem_p;

     const char* m_first_p;

     const char* m_last_p;

+

     mutable std::vector<const char*> m_symbols;

     mutable std::vector< std::pair<const char*, const char*> > m_objects;

 };

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/main.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/main.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/main.cpp	2010-05-13 19:14:19.380581789 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/main.cpp	2010-05-08 15:36:26.000000000 +0100

@@ -22,6 +22,7 @@

 #include <sstream>

 #include <iostream>

 #include <stdexcept>

+#include <cstring>

 const char SELF_NAME[] = "checklib";

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/object/coff_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/coff_object.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/object/coff_object.cpp	2010-05-13 19:14:19.384582019 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/coff_object.cpp	2010-05-08 15:38:08.000000000 +0100

@@ -21,6 +21,7 @@

 #include <algorithm>

 #include <functional>

+#include <cstring>

 Coff_object::Coff_object(const char* p1, const char* p2)

 {

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/object/elf_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/elf_object.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/checklib/object/elf_object.cpp	2010-05-13 19:14:19.384582019 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/elf_object.cpp	2010-05-08 15:37:34.000000000 +0100

@@ -22,6 +22,7 @@

 #include <algorithm>

 #include <functional>

+#include <cstring>

 Elf_object::Elf_object(const char* p1, const char* p2)

 {

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/localise.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/localise.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/localise.cpp	2010-05-13 19:14:19.424582009 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/localise.cpp	2010-05-08 15:38:52.000000000 +0100

@@ -27,9 +27,11 @@

 #pragma warning( disable : 4530 )	// function not inlined.

 #endif

-#include <stdio.h>   

+#include <cstdio>

 #include <iostream>

 #include "ERRORHAN.H"

+#include <cstring>

+#include <cstdlib>

 #if defined(__MSVCDOTNET__) || defined(__TOOLS2__)

 using std::ifstream;

@@ -1787,8 +1789,16 @@

 	const char * fileName = SourceFileName.GetAssertedNonEmptyBuffer();

 	ifstream iFile(fileName);

+#ifdef __LINUX__

+	char LocalisationOutputFileName[sizeof("/tmp/rcomp_temp_XXXXXX")];

+	strcpy(LocalisationOutputFileName,"/tmp/rcomp_temp_XXXXXX");

+	int fd = mkstemp(LocalisationOutputFileName); close(fd);

+#endif

+#ifdef WIN32

 	char * LocalisationOutputFileName;

 	LocalisationOutputFileName = tmpnam(NULL);

+#endif

+

 	ofstream outputFile(LocalisationOutputFileName);

 	String fileLine("");

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/rcomp.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcomp.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/rcomp.cpp	2010-05-13 19:14:19.428582169 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcomp.cpp	2010-05-08 15:41:18.000000000 +0100

@@ -90,8 +90,8 @@

 #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data

 #endif //__VC32__

-#include "resource.h"

-#include "parser.h"

+#include "RESOURCE.H"

+#include "Parser.h"

 int yylex();

 void yyerror(const char* string, ...);

@@ -100,14 +100,14 @@

 extern int yylineno;

 #include "rcomp.hpp"

-#include "datatype.h"

-#include "mem.h"

-#include "rcbinstr.h"

-#include "rcscan.h"

-#include "errorhan.h"

-#include "fileacc.h"

-#include "version.h"

-#include "ctable.h"

+#include "DATATYPE.H"

+#include "MEM.H"

+#include "RCBINSTR.H"

+#include "RCSCAN.H"

+#include "ERRORHAN.H"

+#include "FILEACC.H"

+#include "VERSION.H"

+#include "CTABLE.H"

 #include "localise.h"

 #include "main.h"

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/rcompl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcompl.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/rcompl.cpp	2010-05-13 19:14:19.428582169 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcompl.cpp	2010-05-08 15:40:00.000000000 +0100

@@ -662,8 +662,8 @@

 #include <limits.h>

 #include <string.h>

 #include "main.h"

-#include "structst.h"

-#include "parser.h"

+#include "STRUCTST.H"

+#include "Parser.h"

 #include "localise.h"

 #define YY_SKIP_YYWRAP 1

@@ -696,7 +696,7 @@

 }

 #include "rcomp.hpp"

-#include "fileline.h"

+#include "FILELINE.H"

 #define VALUE_LEN   (1024*8)	// must match sizeof(YYSTYPE.Value)

 char buf[VALUE_LEN];

@@ -734,7 +734,7 @@

 #pragma warning( disable : 4505 )

 #endif //__VC32__

-#include "errorhan.h"

+#include "ERRORHAN.H"

 #define REGISTER_LINE	ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/RCOMP.LEX /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.LEX

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/RCOMP.LEX	2010-05-13 19:14:19.420582828 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.LEX	2010-05-08 15:45:48.000000000 +0100

@@ -20,9 +20,9 @@

 #include <limits.h>

 #include <string.h>

 #include "main.h"

-#include "structst.h"

-#include "parser.h"

-#include "localise.h"

+#include "STRUCTST.H"

+#include "PARSER.H"

+#include "LOCALISE.H"

 #define YY_SKIP_YYWRAP 1

 #define YY_NEVER_INTERACTIVE 1

@@ -92,7 +92,7 @@

 #pragma warning( disable : 4505 )

 #endif //__VC32__

-#include "errorhan.h"

+#include "ERRORHAN.H"

 #define REGISTER_LINE	ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/RCOMP.YACC /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.YACC

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/bintools/rcomp/src/RCOMP.YACC	2010-05-13 19:14:19.424582009 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.YACC	2010-05-08 15:47:00.000000000 +0100

@@ -35,8 +35,8 @@

 #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data

 #endif //__VC32__

-#include "resource.h"

-#include "parser.h"

+#include "RESOURCE.H"

+#include "PARSER.H"

 int yylex();

 void yyerror(const char* string, ...);

@@ -45,14 +45,14 @@

 extern int yylineno;

 #include "rcomp.hpp"

-#include "datatype.h"

-#include "mem.h"

-#include "rcbinstr.h"

-#include "rcscan.h"

-#include "errorhan.h"

-#include "fileacc.h"

-#include "version.h"

-#include "ctable.h"

+#include "DATATYPE.H"

+#include "MEM.H"

+#include "RCBINSTR.H"

+#include "RSCAN.H"

+#include "ERRORHAN.H"

+#include "FILEACC.H"

+#include "VERSION.H"

+#include "CTABLE.H"

 #include "localise.h"

 #include "main.h"

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/buildtoolguides/romtoolsguide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/romtoolsguide/group/bld.inf

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/buildtoolguides/romtoolsguide/group/bld.inf	2010-05-13 19:14:22.500584966 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/romtoolsguide/group/bld.inf	2010-05-08 15:41:44.000000000 +0100

@@ -1,3 +1,3 @@

 PRJ_EXPORTS

-../com.nokia.rombuild_0.1.jar /plugins/com.nokia.rombuild_0.1.jar

\ No newline at end of file

+../com.nokia.rombuild_0.1.jar ../../plugins/com.nokia.rombuild_0.1.jar 

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/buildtoolguides/sbsv2guide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/sbsv2guide/group/bld.inf

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/buildtoolguides/sbsv2guide/group/bld.inf	2010-05-13 19:14:22.504583518 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/sbsv2guide/group/bld.inf	2010-05-08 15:42:04.000000000 +0100

@@ -1,3 +1,3 @@

 PRJ_EXPORTS

-../com.nokia.sysbuild_0.1.jar /plugins/com.nokia.sysbuild_0.1.jar

\ No newline at end of file

+../com.nokia.sysbuild_0.1.jar ../../plugins/com.nokia.sysbuild_0.1.jar

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/e32lib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/e32lib/e32image/deflate/deflate.cpp	2010-05-13 19:14:22.504583518 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp	2010-05-08 14:35:02.000000000 +0100

@@ -87,7 +87,7 @@

 inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)

 	{

-	return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;

+	return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[0]) + (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance)))) HDeflateHash;

 	}

 inline TInt HDeflateHash::Hash(const TUint8* aPtr)

Only in /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/e32lib/e32image: Makefile.elftran.bak

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/e32lib/group/seclib.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/group/seclib.mmp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/e32lib/group/seclib.mmp	2010-05-13 19:14:22.512581742 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/group/seclib.mmp	2010-05-08 14:34:04.000000000 +0100

@@ -45,8 +45,11 @@

 userinclude     ../setcap 

 userinclude     ../../e32lib/e32image/inc

 systeminclude   /epoc32/include

+systeminclude    /epoc32/include/platform

 OPTION          GCC -w

+option 	GCC -w

+

 //macro __PLACEMENT_NEW_INLINE

 //macro __PLACEMENT_VEC_NEW_INLINE

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/group/elf2e32.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/group/elf2e32.mmp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/group/elf2e32.mmp	2010-05-13 19:14:22.512581742 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/group/elf2e32.mmp	2010-05-08 14:17:32.000000000 +0100

@@ -28,7 +28,9 @@

 source	 	byte_pair.cpp  pagedcompress.cpp checksum.cpp stdexe_target.cpp

 systeminclude    /epoc32/include  /epoc32/include/tools  

+systeminclude    /epoc32/include/platform

 userinclude		../source ../include

+userinclude ../../../bintools/elftools/inc

 option 	GCC -w

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/deffile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deffile.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/deffile.cpp	2010-05-13 19:14:22.516582251 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deffile.cpp	2010-05-08 14:31:46.000000000 +0100

@@ -18,9 +18,11 @@

 //

 //

-#include <stdio.h>

+#include <cstdio>

+#include <cstring>

 #include <iostream>

-#include <stdlib.h>

+#include <cstdlib>

+

 #include "pl_symbol.h"

 #include "deffile.h"

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/deflatecompress.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deflatecompress.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/deflatecompress.cpp	2010-05-13 19:14:22.516582251 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deflatecompress.cpp	2010-05-08 14:25:12.000000000 +0100

@@ -126,7 +126,8 @@

 inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)

 {

 	//return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;

-	return new(new char[_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)])]) HDeflateHash;

+	return new(new char[_FOFF(HDeflateHash,iOffset[0]) + 

+		(sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash;

 }

 /**

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/e32exporttable.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32exporttable.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/e32exporttable.cpp	2010-05-13 19:14:22.516582251 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32exporttable.cpp	2010-05-08 14:18:16.000000000 +0100

@@ -18,6 +18,7 @@

 #include "pl_elfexports.h"

 #include "pl_dllsymbol.h"

 #include "pl_elflocalrelocation.h"

+#include <cstring>

 /**

 Destructor for E32ExportTable class.

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/e32imagefile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32imagefile.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/e32imagefile.cpp	2010-05-13 19:14:22.520581921 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32imagefile.cpp	2010-05-08 14:20:20.000000000 +0100

@@ -21,6 +21,7 @@

 // get E32ImageHeader class...

 #define INCLUDE_E32IMAGEHEADER_IMPLEMENTATION

+#include <cstdio>

 #define RETURN_FAILURE(_r) return (fprintf(stderr, "line %d\n", __LINE__),_r)

 //#define E32IMAGEHEADER_TRACE(_t) printf _t

 #include "e32imagefile.h"

@@ -40,11 +41,9 @@

 #include <iostream>

 #ifndef __LINUX__ 

     #include <io.h>

-#else

-    #include <time.h>

 #endif 

-#include <time.h>

-#include <stdio.h>

+#include <ctime>

+

 using namespace std;

@@ -365,7 +364,7 @@

 	iImportSectionSize = aTotalSize;

 	iImportSection = (uint32 *)new char[aTotalSize];

 	memset(iImportSection, 0, aTotalSize);

-	memcpy(iImportSection, aImportSection.begin(), aImportSectionSize);

+	memcpy(iImportSection, &*aImportSection.begin(), aImportSectionSize);

 	char * strTab = ((char *)iImportSection) + aImportSectionSize;

 	memcpy(strTab, aStrTab.data(), aStrTab.size());

@@ -1922,7 +1921,7 @@

 	memcpy(aInfo, (void*)&aSymInf, sizeof(aSymInf));

 	TUint aPos = aSymInf.iSymbolTblOffset;

-	memcpy(aInfo+aPos, iSymAddrTab.begin(), iSymAddrTab.size()*sizeof(uint32));

+	memcpy(aInfo+aPos, &*iSymAddrTab.begin(), iSymAddrTab.size()*sizeof(uint32));

 	aPos += iSymAddrTab.size()*aSizeofNames;

 	aPos += iSymNameOffTab.size()*aSizeofNames;

@@ -1933,13 +1932,13 @@

 	if(aSymInf.iFlags & 1)

 		aOffLen=4;

 	while(Iter != iSymNameOffTab.end()){

-		memcpy( ((void*)(aInfo+aPos)), ((void*)Iter), aOffLen);

+		memcpy( ((void*)(aInfo+aPos)), &*Iter, aOffLen);

 		aPos += aOffLen;

 		Iter++;

 	}

 	aPos = aSymInf.iStringTableOffset;

-	memcpy(aInfo+aPos, iSymbolNames.begin(), iSymbolNames.size());

+	memcpy(aInfo+aPos, &*iSymbolNames.begin(), iSymbolNames.size());

 	// At the end, the dependencies are listed. They remain zeroes and shall be fixed up

 	// while relocating.

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/elffilesupplied.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/elffilesupplied.cpp	2010-05-13 19:14:22.520581921 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp	2010-05-08 14:22:14.000000000 +0100

@@ -25,7 +25,15 @@

 #include <algorithm>

 #include <iostream>

-#include<hash_set>

+#if __GNUC__ < 4

+    #include <ext/hash_set>

+    #define SET_TYPE __gnu_cxx::hash_set

+    #define HASH_FUN __gnu_cxx::hash

+#else    

+    #include <unordered_set>

+    #define SET_TYPE std::unordered_set

+    #define HASH_FUN std::hash

+#endif

 using namespace std;

@@ -638,7 +646,7 @@

 */ 

 int ElfFileSupplied::UnWantedSymbolp(const char * aSymbol)

 {

-  static hash_set<const char*, hash<const char*>, eqstr> aSymbolSet;

+  static SET_TYPE<const char*, HASH_FUN<const char*>, eqstr> aSymbolSet;

   int symbollistsize=sizeof(Unwantedruntimesymbols)/sizeof(Unwantedruntimesymbols[0]);

   static bool FLAG=false;

   while(!FLAG)

@@ -649,7 +657,7 @@

 	}

 	FLAG=true;

   }

-  hash_set<const char*, hash<const char*>, eqstr>::const_iterator it

+  SET_TYPE<const char*, HASH_FUN<const char*>, eqstr>::const_iterator it

     = aSymbolSet.find(aSymbol);

   if(it != aSymbolSet.end())

 	return 1;

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/errorhandler.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/errorhandler.cpp	2010-05-13 19:14:22.520581921 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/errorhandler.cpp	2010-05-08 14:24:02.000000000 +0100

@@ -26,7 +26,9 @@

 #include "errorhandler.h"

 #include "messagehandler.h"

 #include <iostream>

-#include <stdio.h>

+#include <cstdio>

+#include <cstring>

+

 using std::cerr;

 using std::endl;

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/huffman.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/huffman.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/huffman.cpp	2010-05-13 19:14:22.528582030 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/huffman.cpp	2010-05-08 14:25:08.000000000 +0100

@@ -22,6 +22,7 @@

 #endif

 #include <cassert>

+#include <cstring>

 #include "huffman.h"

 #include "errorhandler.h"

 #include "farray.h"

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/h_utl.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/h_utl.cpp	2010-05-13 19:14:22.524582150 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/h_utl.cpp	2010-05-08 14:33:02.000000000 +0100

@@ -17,8 +17,9 @@

 // 

 //

-#include <stdlib.h>

-#include <stdio.h>

+#include <cstdlib>

+#include <cstdio>

+#include <cstring>

 #include "h_utl.h"

 /**

Only in /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source: h_utl.h.bak

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/inflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/inflate.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/inflate.cpp	2010-05-13 19:14:22.528582030 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/inflate.cpp	2010-05-08 14:25:46.000000000 +0100

@@ -23,6 +23,8 @@

 #include "farray.h"

 #include "errorhandler.h"

 #include<iostream>

+#include <cstring>

+

 using std::cout;

 /*

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/messageimplementation.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/messageimplementation.cpp	2010-05-13 19:14:22.532582119 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/messageimplementation.cpp	2010-05-08 14:33:34.000000000 +0100

@@ -23,7 +23,8 @@

 #include<iostream>

 #include<stdarg.h>

 #include<string>

-#include <stdio.h>

+#include <cstring>

+

 using std::endl;

 using std::cout;

diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/parametermanager.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.cpp

--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/parametermanager.cpp	2010-05-13 19:14:22.532582119 +0100

+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.cpp	2010-05-12 14:24:20.025099230 +0100

@@ -647,7 +647,7 @@

 			parser(this, "help", 0, 0);

 		}

-		parser(this, const_cast<char*>(aName.c_str()), optval, aDesc);

+		parser(this, aName.c_str(), optval, aDesc);

 	}

 }

@@ -2247,7 +2247,7 @@

 		{

 			int len = nq;

 			symbol = new char[len+1];

-			memcpy(symbol, p, len);

+			memcpy(symbol, &*p, len);

 			symbol[len] = 0;

 			q = nq+1;

@@ -2387,7 +2387,7 @@

 			if (*e == '-' || *e == '+') break;

 		}

 		if (e != b)

-			ParseCapability1(b, e, aCapabilities, invert);

+			ParseCapability1(&*b, &*e, aCapabilities, invert);

 		b = e;