FCL/interim/sftools/linux_build: comparison cross-plat-dev-utils/patch-files/diffs/patch-0f5e3a7fb6af.patch

equal deleted inserted replaced

-:d610106f78c9
+:5e7562f67577
 ## 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -25,6 +25,7 @@
 #include <iostream>
 #include <iomanip>
 #include <cstdlib>
 +#include <cstring>
 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.h	2010-05-15 14:32:45.000000000 +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;
 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/main.cpp	2010-05-15 16:32:57.000000000 +0100
-@@ -22,6 +22,7 @@
+@@ -22,6 +22,8 @@
 #include <sstream>
 #include <iostream>
 #include <stdexcept>
 +#include <cstring>
++#include <cstdlib>
 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/coff_object.cpp	2010-05-15 14:32:45.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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/elf_object.cpp	2010-05-15 14:32:45.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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/localise.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -27,9 +27,11 @@
 #pragma warning( disable : 4530 )	// function not inlined.
 #endif
 -#include <stdio.h>
 	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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcomp.cpp	2010-05-15 14:32:45.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 "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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcompl.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -662,8 +662,8 @@
 #include <limits.h>
 #include <string.h>
 #include "main.h"
 -#include "structst.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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.LEX	2010-05-15 14:32:45.000000000 +0100
 @@ -20,9 +20,9 @@
 #include <limits.h>
 #include <string.h>
 #include "main.h"
 -#include "structst.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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.YACC	2010-05-15 14:32:45.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"
 -../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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -87,7 +87,7 @@
 inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)
 	{
 -	return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/group/seclib.mmp	2010-05-15 14:32:45.000000000 +0100
 @@ -45,8 +45,11 @@
 userinclude     ../setcap
 userinclude     ../../e32lib/e32image/inc
 systeminclude   /epoc32/include
 +systeminclude    /epoc32/include/platform
 //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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/group/elf2e32.mmp	2010-05-15 14:32:45.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
 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deffile.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -18,9 +18,11 @@
 //
 //
 -#include <stdio.h>
 #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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deflatecompress.cpp	2010-05-15 14:32:45.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;
 }
 /**
 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32exporttable.cpp	2010-05-15 14:32:45.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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32imagefile.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -21,6 +21,7 @@
 // get E32ImageHeader class...
 #define INCLUDE_E32IMAGEHEADER_IMPLEMENTATION
 +#include <cstdio>
 	// 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -25,7 +25,15 @@
 #include <algorithm>
 #include <iostream>
 -#include<hash_set>
 = 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/errorhandler.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -26,7 +26,9 @@
 #include "errorhandler.h"
 #include "messagehandler.h"
 #include <iostream>
 -#include <stdio.h>
 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/huffman.cpp	2010-05-15 14:32:45.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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/h_utl.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -17,8 +17,9 @@
 //
 //
 -#include <stdlib.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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/inflate.cpp	2010-05-15 14:32:45.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/librarytarget.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/librarytarget.cpp
+--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/librarytarget.cpp	2010-05-13 19:14:22.528582030 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/librarytarget.cpp	2010-05-15 16:38:11.000000000 +0100
+@@ -21,6 +21,7 @@
+#include "pl_dso_handler.h"
+#include "deffile.h"
+#include <iostream>
++#include <cstdlib>
+/**
+Constructor for the Library 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/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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/messageimplementation.cpp	2010-05-15 16:37:05.000000000 +0100
-@@ -23,7 +23,8 @@
+@@ -23,7 +23,9 @@
 #include<iostream>
 #include<stdarg.h>
 #include<string>
 -#include <stdio.h>
 +#include <cstring>
++#include <cstdlib>
 +
 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
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.cpp	2010-05-15 16:38:48.000000000 +0100
-@@ -647,7 +647,7 @@
+@@ -25,6 +25,7 @@
+#include "parametermanager.h"
+#include "errorhandler.h"
+#include <iostream>
++#include <cstdlib>
+#include "h_utl.h"
+#include "h_ver.h"
+@@ -647,7 +648,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 @@
+@@ -2247,7 +2248,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 @@
+@@ -2387,7 +2388,7 @@
 			if (*e == '-' || *e == '+') break;
 		}
 		if (e != b)
 -			ParseCapability1(b, e, aCapabilities, invert);
 +			ParseCapability1(&*b, &*e, aCapabilities, invert);
 		b = e;
 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.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/parametermanager.h	2010-05-13 19:14:22.532582119 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.h	2010-05-12 14:23:46.225599591 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.h	2010-05-15 14:32:45.000000000 +0100
 @@ -81,7 +81,7 @@
 	typedef std::map<string, const OptionDesc *, OptionCompare> OptionMap;
 	typedef vector<char *> LibSearchPaths;
 -	typedef void (*ParserFn)(ParameterManager *, char *, char *, const OptionDesc *);
 	#define DECLARE_PARAM_PARSER(name) \
 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/pl_elfexecutable.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/pl_elfexecutable.h	2010-05-13 19:14:22.536582488 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h	2010-05-08 14:31:06.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h	2010-05-15 14:32:45.000000000 +0100
 @@ -22,13 +22,19 @@
 #include "pl_common.h"
 #include <list>
 -#include <hash_map>
 	/**
 	 * The static symbol table.
 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/pl_elfexports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/pl_elfexports.cpp	2010-05-13 19:14:22.536582488 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp	2010-05-08 14:20:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -20,6 +20,7 @@
 #include "pl_elfexports.h"
 #include "pl_elfexecutable.h"
 #include "pl_dllsymbol.h"
 +#include <cstring>
 using std::set_difference;
 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/pl_elfimports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/pl_elfimports.cpp	2010-05-13 19:14:22.536582488 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp	2010-05-08 14:32:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -19,6 +19,7 @@
 #include "pl_elfimports.h"
 #include "pl_elfimportrelocation.h"
 +#include <cstring>
 /**
 Constructor for class ElfImports
 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/pl_elfproducer.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/pl_elfproducer.cpp	2010-05-13 19:14:22.540581739 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp	2010-05-08 14:23:30.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <string>
 #include "errorhandler.h"
 +#include <cstring>
 /**
 * Following array is indexed on the SECTION_INDEX enum
 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/pl_symbol.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_symbol.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/e32tools/elf2e32/source/pl_symbol.cpp	2010-05-13 19:14:22.544581968 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_symbol.cpp	2010-05-08 14:18:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_symbol.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -18,6 +18,7 @@
 //
 #include "pl_symbol.h"
 +#include <cstring>
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/buildrom/tools: featuredatabase.dtd.bak
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/buildrom/tools: featureuids.dtd.bak
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/buildrom/tools: imageContent.dtd.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/imgtools/imgcheck/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/bld.inf
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/group/bld.inf	2010-05-13 19:14:22.580581863 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/bld.inf	2010-05-08 15:25:20.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/bld.inf	2010-05-15 14:32:45.000000000 +0100
 @@ -21,8 +21,10 @@
 // These libraries needs to be exported
 PRJ_EXPORTS
 +#ifndef TOOLS2_LINUX
 ../src/imgcheck.xsl			/epoc32/tools/imgcheck.xsl
 ./imgcheck.pl				/epoc32/tools/imgcheck.pl
 ./imgcheck.cmd				/epoc32/tools/imgcheck.cmd
 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/imgtools/imgcheck/group/imgcheck.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/imgcheck.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/group/imgcheck.mmp	2010-05-13 19:14:22.580581863 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/imgcheck.mmp	2010-05-08 17:31:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/imgcheck.mmp	2010-05-15 16:53:48.000000000 +0100
 @@ -25,17 +25,24 @@
 SOURCE		exceptionimplementation.cpp exceptionreporter.cpp
 SOURCE 		cmdlinewriter.cpp xmlwriter.cpp dbgflagchecker.cpp
 USERINCLUDE ../libimgutils/inc ../inc ../../imglib/compress
 +#ifndef TOOLS2_LINUX
 #else
 STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32
 OPTION    GCC -mthreads -O2 -Wno-uninitialized
 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/imgtools/imgcheck/inc/cmdlinehandler.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/inc/cmdlinehandler.h	2010-05-13 19:14:22.805083364 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h	2010-05-08 15:31:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h	2010-05-15 14:32:45.000000000 +0100
 @@ -120,7 +120,7 @@
 @internalComponent
 @released
 */
 -typedef enum Suppress
 {
 ENone = 0x0,
 ESingle = 0x1,
 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/imgtools/imgcheck/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/common.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/inc/common.h	2010-05-13 19:14:22.805083364 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/common.h	2010-05-08 15:30:02.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/common.h	2010-05-15 14:32:45.000000000 +0100
 @@ -86,7 +86,7 @@
 @internalComponent
 @released
 */
 -typedef enum ReturnType
 {
 	ESuccess = 0,
 	EQuit,
 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/imgtools/imgcheck/inc/exceptionimplementation.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/inc/exceptionimplementation.h	2010-05-13 19:14:22.805083364 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h	2010-05-08 15:30:50.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h	2010-05-15 14:32:45.000000000 +0100
 @@ -91,7 +91,7 @@
 struct Messages
 {
 	int iIndex;
 -	char* iMessage;
 	IndexVsMessageMap iMessage;
 	unsigned int iMsgIndex;
 	static unsigned int iCmdFlag;
 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/imgtools/imgcheck/inc/xmlwriter.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/xmlwriter.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/inc/xmlwriter.h	2010-05-13 19:14:22.809081638 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/xmlwriter.h	2010-05-08 15:32:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/xmlwriter.h	2010-05-15 14:32:45.000000000 +0100
 @@ -24,7 +24,12 @@
 #define XMLWRITER_H
 #include "reportwriter.h"
 -#include "libxml/xmlwriter.h"
 	// Xml file name for output.
 	const String iXmlFileName;
 	// Xml Buffer pointer.
 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/imgtools/imgcheck/libimgutils/inc/romfsentry.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/romfsentry.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/libimgutils/inc/romfsentry.h	2010-05-13 19:14:22.809081638 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/romfsentry.h	2010-05-12 19:58:30.300831269 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/romfsentry.h	2010-05-15 14:32:45.000000000 +0100
 @@ -32,7 +32,7 @@
 class RomImageFSEntry
 {
 public:
 -	RomImageFSEntry (char* aName)
 	{
 	}
 	~RomImageDirEntry(void)
 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/imgtools/imgcheck/libimgutils/inc/typedefs.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/libimgutils/inc/typedefs.h	2010-05-13 19:14:22.809081638 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h	2010-05-08 15:36:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h	2010-05-15 14:32:45.000000000 +0100
 @@ -28,8 +28,8 @@
 #undef _L
 -#include <fstream.h>
 {
 	EUnknownImage,
 	ERomImage,
 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/imgtools/imgcheck/libimgutils/src/dirreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp	2010-05-13 19:14:22.813082775 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp	2010-05-08 15:34:42.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -119,9 +119,9 @@
 void DirReader::ProcessImage()
 {
 	char* cwd = new char[MAXPATHLEN];
 -	getcwd(cwd,MAXPATHLEN);
 +#endif
 +
 	E32Image* e32Image = KNull;
 #ifdef __LINUX__
+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/imgtools/imgcheck/libimgutils/src/e32reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/e32reader.cpp
+--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/libimgutils/src/e32reader.cpp	2010-05-13 19:14:22.813082775 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/e32reader.cpp	2010-05-15 16:45:25.000000000 +0100
+@@ -24,6 +24,7 @@
+#include "e32reader.h"
+#include <f32image.h>
++#include <cstdlib>
+/**
+Constructor.
 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/imgtools/imgcheck/src/cmdlinehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/src/cmdlinehandler.cpp	2010-05-13 19:14:22.856604788 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp	2010-05-08 15:21:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -25,6 +25,7 @@
 */
 #include "cmdlinehandler.h"
 +#include <cstring>
 /**
 Constructor initializes the iOptionMap with short and long option names as key and
 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/imgtools/imgcheck/src/cmdlinewriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/src/cmdlinewriter.cpp	2010-05-13 19:14:22.856604788 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp	2010-05-08 15:22:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -24,6 +24,7 @@
 */
 #include "cmdlinewriter.h"
 +#include <cstring>
 /**
 Constructor: CmdLineWriter 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/imgtools/imgcheck/src/exceptionimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/src/exceptionimplementation.cpp	2010-05-13 19:14:22.856604788 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp	2010-05-08 15:24:58.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -187,7 +187,7 @@
 	if(iCmdFlag & KVerbose)
 	{
 -		cout << aMsg.c_str() << endl;
 +		std::cerr << aMsg.c_str() << 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/imgtools/imgcheck/src/sidchecker.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/sidchecker.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/src/sidchecker.cpp	2010-05-13 19:14:22.861082172 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/sidchecker.cpp	2010-05-08 15:24:08.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/sidchecker.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -249,8 +249,8 @@
 	{
 		exeAtt->iAttStatus = KNull;
 	}
 -	if((iAllExecutables
 		|| iNoCheck)
 	{
 		aExeContainer->iExeAttList.push_back(exeAtt);
 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/imgtools/imgcheck/src/xmlwriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/xmlwriter.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imgcheck/src/xmlwriter.cpp	2010-05-13 19:14:22.861082172 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/xmlwriter.cpp	2010-05-09 13:32:35.689287000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/xmlwriter.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -24,9 +24,10 @@
 */
 #include "xmlwriter.h"
 +#include <cstring>
 	if(!xslDestHandle)
 	{
 		delete [] filetocopy;
 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/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp	2010-05-13 19:14:23.441088858 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp	2010-05-09 13:34:57.929288000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp	2010-05-15 14:32:45.000000000 +0100
 @@ -8,7 +8,7 @@
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/exceptions.hpp>
 #include <boost/shared_ptr.hpp>
 -#include <boost/enable_shared_from_this.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/optional.hpp>
 #include <pthread.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/imgtools/imglib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/e32image/deflate/deflate.cpp	2010-05-13 19:14:23.493081572 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp	2010-05-08 14:38:16.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -20,6 +20,7 @@
 #include "deflate.h"
 #include "h_utl.h"
 #include "panic.h"
 +#define OFFSETOF(c,f) (((TInt)&(((c *)0x1000)->f))-0x1000)
 	}
 inline TInt HDeflateHash::Hash(const TUint8* aPtr)
 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/imgtools/imglib/e32image/deflate/panic.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/panic.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/e32image/deflate/panic.cpp	2010-05-13 19:14:23.497082779 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/panic.cpp	2010-05-08 14:37:24.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/panic.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -21,7 +21,7 @@
 #include "h_utl.h"
 #include <stdlib.h>
 -char* HuffmanError[]=	{
 						"Huffman: Too many codes\n",
 						"Huffman: Invalid coding\n",
 						"Huffman: Buffer overflow\n",
 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/imgtools/imglib/e32uid/uidcrc.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32uid/uidcrc.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/e32uid/uidcrc.cpp	2010-05-13 19:14:23.497082779 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32uid/uidcrc.cpp	2010-05-08 14:36:56.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32uid/uidcrc.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -55,7 +55,7 @@
 	for (i=1; i<4; i++)
 		{
 -		char* endptr = "failed";
 		uids[i] = strtoul(argv[i],&endptr,0);
 		if (*endptr!='\0')
 			{
 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/imgtools/imglib/filesystem/include/errorhandler.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/errorhandler.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/include/errorhandler.h	2010-05-13 19:14:23.501082380 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/errorhandler.h	2010-05-12 19:43:57.948831013 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/errorhandler.h	2010-05-15 14:32:45.000000000 +0100
 @@ -36,8 +36,8 @@
 class ErrorHandler
 {
 	public:
 -		ErrorHandler(int aMessageIndex,char* aSubMessage,char* aFileName, int aLineNumber);
 +		ErrorHandler(int aMessageIndex,char const * aSubMessage,char const * aFileName, int aLineNumber);
 +        ErrorHandler(int aMessageIndex, char const* aFileName, int aLineNumber);
 		virtual ~ErrorHandler();
 		void Report();
+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/imgtools/imglib/filesystem/include/filesysteminterface.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/filesysteminterface.h
+--- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/include/filesysteminterface.h	2010-05-13 19:14:23.501082380 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/filesysteminterface.h	2010-05-15 16:42:12.000000000 +0100
+@@ -24,6 +24,7 @@
+#include "directory.h"
+#include <fstream>
++#include <cstdlib>
+typedef std::ofstream Ofstream;
 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/imgtools/imglib/filesystem/include/messagehandler.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/messagehandler.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/include/messagehandler.h	2010-05-13 19:14:23.501082380 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/messagehandler.h	2010-05-12 19:48:35.893331147 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/messagehandler.h	2010-05-15 14:32:45.000000000 +0100
 @@ -36,9 +36,9 @@
 public:
 		static Message *GetInstance();
 		static void CleanUp();
 -		static void StartLogging(char *filename);
 private:
 		static Message* iInstance;
 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/imgtools/imglib/filesystem/include/messageimplementation.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/messageimplementation.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/include/messageimplementation.h	2010-05-13 19:14:23.501082380 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/messageimplementation.h	2010-05-12 19:54:26.568831118 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/include/messageimplementation.h	2010-05-15 14:32:45.000000000 +0100
 @@ -84,7 +84,7 @@
 		// display message to output device
 		virtual void Output(const char *aName) =0;
 		// start logging to a file
 -		virtual void StartLogging(char *fileName)=0;
 		void ReportMessage(int aMsgType, int aMsgIndex,...);
 		void InitializeMessages();
 private:
 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/imgtools/imglib/filesystem/source/cluster.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/cluster.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/cluster.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/cluster.cpp	2010-05-12 14:37:01.301106883 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/cluster.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -143,7 +143,9 @@
 {
 	if(iCurrentClusterNumber >= iTotalNumberOfClusters)
 	{
 -    	throw ErrorHandler(IMAGESIZETOOBIG,"Occupied number of clusters count exceeded than available clusters",__FILE__,__LINE__);
 	}
 	++iCurrentClusterNumber;
 }
 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/imgtools/imglib/filesystem/source/dirregion.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/dirregion.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp	2010-05-12 14:43:35.669597925 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -49,7 +49,7 @@
 	iClusterPtr = CCluster::Instance(iClusterSize,totalClusters);
 	if(iClusterPtr == NULL)
 	{
 -		throw ErrorHandler(CLUSTERERROR,"Instance creation error", __FILE__, __LINE__);
 	}
 }
 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/imgtools/imglib/filesystem/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/errorhandler.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp	2010-05-12 19:45:04.149330876 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -22,9 +22,10 @@
 #include "errorhandler.h"
 #include "messagehandler.h"
 +#include <cstring>
 : iFileName(aFileName), iLineNumber(aLineNumber)
 {
 	iMessageIndex = aMessageIndex;
 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/imgtools/imglib/filesystem/source/fat16bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp	2010-05-08 14:43:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -21,6 +21,7 @@
 */
 #include "fat16bootsector.h"
 +#include <cstring>
 /**
 Constructor of the fat16 boot sector 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/imgtools/imglib/filesystem/source/fat16filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp	2010-05-12 19:42:41.053330333 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -21,7 +21,7 @@
 */
 #include"fat16filesystem.h"
 -
 +		throw ErrorHandler(UNKNOWNERROR,__FILE__,__LINE__);
 	}
 }
 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/imgtools/imglib/filesystem/source/fat32bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp	2010-05-08 14:48:14.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -21,6 +21,7 @@
 */
 #include "fat32bootsector.h"
 +#include <cstring>
 /**
 Constructor of the fat16 boot sector 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/imgtools/imglib/filesystem/source/fat32filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp	2010-05-12 14:34:09.953097477 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -21,6 +21,7 @@
 */
 #include"fat32filesystem.h"
 +#include <cstring>
 	}
 }
 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/imgtools/imglib/filesystem/source/fatbasebootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp	2010-05-08 14:43:16.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -22,6 +22,7 @@
 */
 #include "fatbasebootsector.h"
 +#include <cstring>
 /**
 Constructor of the base boot sector 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/imgtools/imglib/filesystem/source/filesysteminterface.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp	2010-05-13 19:14:23.505082539 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp	2010-05-12 14:36:03.421601378 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -62,7 +62,7 @@
 		iOutputStream.open(aImageFileName,ios::out|ios::binary);
 		if(iOutputStream.fail() == true )
 		{
 -			throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__, __LINE__);
 		}
 		switch(aFileSystem)
 		{
 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/imgtools/imglib/filesystem/source/longname.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/longname.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/longname.cpp	2010-05-13 19:14:23.509081790 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/longname.cpp	2010-05-12 14:40:22.881098047 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/longname.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -21,6 +21,7 @@
 #include "longname.h"
 +#include <cstring>
 	}
 	FormatLongFileName(iLongName);
 	iShortName = GetShortEntryName();
 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/imgtools/imglib/filesystem/source/messagehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messagehandler.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/messagehandler.cpp	2010-05-13 19:14:23.509081790 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messagehandler.cpp	2010-05-12 19:48:34.396830339 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messagehandler.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -51,7 +51,7 @@
 @param aFileName
 Name of the Log File
 */
 -void MessageHandler::StartLogging(char *aFileName)
 {
 	GetInstance()->ReportMessage(aMsgType,aMsgIndex,aName);
 }
 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/imgtools/imglib/filesystem/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/filesystem/source/messageimplementation.cpp	2010-05-13 19:14:23.509081790 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp	2010-05-12 19:52:40.993330164 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -23,15 +23,17 @@
 #include "messageimplementation.h"
 #include "errorhandler.h"
 +#include <cstring>
 {
 	char logFile[1024];
 	FILE *fptr;
 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/imgtools/imglib/host/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/host/h_utl.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/host/h_utl.cpp	2010-05-13 19:14:23.509081790 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/host/h_utl.cpp	2010-05-08 14:36:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/host/h_utl.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -177,7 +177,7 @@
 	TInt build=0;
 -	memset(&aVersion, sizeof(TVersion), 0);
 	if (pMinor)
 		{
 		pMinor++;
 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/imgtools/imglib/inc/h_utl.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/inc/h_utl.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/inc/h_utl.h	2010-05-13 19:14:23.513082299 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/inc/h_utl.h	2010-05-08 14:39:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/inc/h_utl.h	2010-05-15 14:32:45.000000000 +0100
 @@ -65,9 +65,6 @@
 #define _stricmp strcasecmp
 #define strnicmp strncasecmp
 -// to fix the linux problem: memcpy does not work with overlapped areas.
 // hand-rolled strupr function for converting a string to all uppercase
 char* strupr(char *a);
 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/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp	2010-05-13 19:14:23.513082299 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp	2010-05-08 14:35:28.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -21,6 +21,7 @@
 #include "parameterfileprocessor.h"
 +#include <cstring>
 /**
 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/imgtools/romtools/group/BLD.INF /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/BLD.INF
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/group/BLD.INF	2010-05-13 19:14:23.517082109 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/BLD.INF	2010-04-29 15:03:58.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/BLD.INF	2010-05-15 14:32:45.000000000 +0100
 @@ -15,13 +15,14 @@
 *
 */
 +#include <productvariant.hrh>
 ../maksym/hpsym.bat                 /epoc32/tools/hpsym.bat
 ../maksym/maksym.bat                /epoc32/tools/maksym.bat
 ../maksym/maksymrofs.bat            /epoc32/tools/maksymrofs.bat
 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/imgtools/romtools/group/readimage.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/readimage.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/group/readimage.mmp	2010-05-13 19:14:23.517082109 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/readimage.mmp	2010-05-08 14:49:50.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/readimage.mmp	2010-05-15 14:32:45.000000000 +0100
 @@ -45,15 +45,16 @@
 userinclude     ..\..\imglib\compress
 userinclude		..\..\imglib\patchdataprocessor\include
 userinclude		..\..\sisutils\inc
 +#ifndef TOOLS2_LINUX
 #else
 STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32
 OPTION    GCC -mthreads -O2 -Wno-uninitialized
 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/imgtools/romtools/readimage/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/common.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/inc/common.h	2010-05-13 19:14:23.521083525 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/common.h	2010-05-12 20:12:58.285330621 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/common.h	2010-05-15 14:32:45.000000000 +0100
 @@ -46,7 +46,7 @@
 #define DLL_UID1	10000079
 #define EXE_UID1	1000007a
 -typedef enum EImageType
 +			TUint aDataWidth=8, char aFiller='0', TUint aMaxDescWidth=28);
 #endif //__IMAGE_READER_COMMON_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/imgtools/romtools/readimage/inc/image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/image_reader.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/inc/image_reader.h	2010-05-13 19:14:23.521083525 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/image_reader.h	2010-05-08 15:02:34.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/image_reader.h	2010-05-15 14:32:45.000000000 +0100
 @@ -27,7 +27,19 @@
 #include "common.h"
 -#include <direct.h>
 #include <map>
 typedef struct tag_FILEINFO
 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/imgtools/romtools/readimage/inc/rofs_image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/inc/rofs_image_reader.h	2010-05-13 19:14:23.521083525 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h	2010-05-12 14:54:55.029099961 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h	2010-05-15 14:32:45.000000000 +0100
 @@ -65,10 +65,10 @@
 	void DumpDirStructure();
 	void DumpFileAttributes();
 	void MarkNodes();
 -	void SetSeek(streampos aOff, ios::seek_dir aStartPos=ios::beg);
 	void WriteEntryToFile(char* aFileName,TRomNode* aNode,ofstream& aLogFile);
 	void GetFileInfo(FILEINFOMAP &aFileMap);
 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/imgtools/romtools/readimage/src/common.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/common.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/src/common.cpp	2010-05-13 19:14:23.521083525 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/common.cpp	2010-05-12 20:18:29.509331018 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/common.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -40,7 +40,7 @@
 	*out << "Usage Error:" << iErrMessage.c_str() << endl;
 }
 -ostream& DumpInHex(char* aDesc, TUint32 aData, bool aContinue, TUint aDataWidth, \
 				   char aFiller, TUint aMaxDescWidth)
 {
 	TUint aDescLen = strlen(aDesc);
 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/imgtools/romtools/readimage/src/e32_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/src/e32_image_reader.cpp	2010-05-13 19:14:23.525082148 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp	2010-05-12 15:03:06.013600086 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -75,26 +75,26 @@
 	bool aContinue = true;
 	DumpInHex("Size", aE32Image.iSize ) << endl;
 -	DumpInHex("Uids",aE32Image.iOrigHdr->iUid1);
 	TUint aHeaderFmt = E32ImageHeader::HdrFmtFromFlags(aE32Image.iOrigHdr->iFlags);
 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/imgtools/romtools/readimage/src/image_handler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_handler.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/src/image_handler.cpp	2010-05-13 19:14:23.525082148 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_handler.cpp	2010-05-12 14:59:42.797598037 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_handler.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -392,7 +392,7 @@
 	{
 		if(iInputFileName.empty())
 		{
 -			throw SisUtilsException("Usage Error", "No SIS file passed");
 		}
 	}
 }
 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/imgtools/romtools/readimage/src/image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_reader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/src/image_reader.cpp	2010-05-13 19:14:23.525082148 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_reader.cpp	2010-05-08 14:57:10.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_reader.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -173,7 +173,7 @@
 	// get the current working directory and store in buffer.
 -	if( _getcwd(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL )
 		// replace the source path with the original path information.
 		strcpy(aSrcPath,origPath.c_str());
 		delete[] currWorkingDir;
 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/imgtools/romtools/readimage/src/rofs_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp	2010-05-13 19:14:23.525082148 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp	2010-05-12 20:14:02.065330046 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -42,7 +42,7 @@
 	delete iImageReader;
 }
 -void RofsImageReader::SetSeek(streampos aOff, ios::seek_dir aStartPos)
 				}
 			}
 			else
 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/imgtools/romtools/readimage/src/rom_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/readimage/src/rom_image_reader.cpp	2010-05-13 19:14:23.525082148 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp	2010-05-12 20:14:55.472828545 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -20,6 +20,12 @@
 #include <e32rom.h>
 #include "rom_image_reader.h"
 #include "r_rom.h"
 +#if defined(WIN32)
 }
 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/imgtools/romtools/rofsbuild/r_build.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_build.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/r_build.cpp	2010-05-13 19:14:23.525082148 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_build.cpp	2010-05-08 15:04:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_build.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -29,7 +29,7 @@
 #if defined(__MSVCDOTNET__) || defined(__TOOLS2__)
 	#include <iomanip>
 -	#include <strstream>
 			compression = f.iHdr->CompressionType();
 			memcpy(&iUids[0], aDest, sizeof(iUids));
 			}
 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/imgtools/romtools/rofsbuild/r_coreimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/r_coreimage.cpp	2010-05-13 19:14:23.525082148 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp	2010-05-12 15:56:04.265098243 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -305,7 +305,7 @@
 @param aInfo Used by the caller to identify where the error occurred.
 @return Error number. KErrNone is returned if there are no errors.
 */
 -TInt RCoreImageReader::ImageError(int aItemsRead, int aExpected, char *aInfo)
 	{
 	if (aItemsRead != aExpected)
 		{
 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/imgtools/romtools/rofsbuild/r_coreimage.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/r_coreimage.h	2010-05-13 19:14:23.525082148 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.h	2010-05-12 15:56:07.345100720 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.h	2010-05-15 14:32:45.000000000 +0100
 @@ -103,7 +103,7 @@
 	TText* Filename();
 private:
 	TInt ReadIdentifier();
 -	TInt ImageError(int aBytesRead, int aExpected, char* aInfo);
 	/** Image type of the file being read */
 	TImageType iImageType;
 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/imgtools/romtools/rofsbuild/r_driveimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/r_driveimage.cpp	2010-05-13 19:14:23.529081888 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp	2010-04-21 13:27:26.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -254,7 +254,7 @@
 	fileName.append("/");
 	// Go through each entry
 -	while(dirEntry = readdir(dirHandler))
 		{
 		if(dirEntry->d_type != DT_DIR)
 			{
 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/imgtools/romtools/rofsbuild/r_driveutl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/r_driveutl.cpp	2010-05-13 19:14:23.529081888 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp	2010-05-08 15:05:24.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -82,7 +82,7 @@
 /**
 Time Stamp for Log file.
 */
 -TAny GetLocalTime(TAny)
 	{
 	struct tm *aNewTime = NULL;
 	time_t aTime = 0;
 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/imgtools/romtools/rofsbuild/r_driveutl.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/r_driveutl.h	2010-05-13 19:14:23.529081888 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h	2010-05-08 15:08:42.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h	2010-05-15 14:32:45.000000000 +0100
 @@ -24,6 +24,6 @@
 #include <e32def.h>
 TInt Getlogfile(TText *aDriveObeyFileName,TText* &aPadLogFile);
 -TAny GetLocalTime(TAny);
 +TAny GetLocalTime();
 #endif
 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/imgtools/romtools/rofsbuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/r_obey.cpp	2010-05-13 19:14:23.529081888 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp	2010-05-12 09:50:42.805097594 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -47,6 +47,7 @@
 #include <time.h>
 #include <assert.h>
 #include <errno.h>
 +#include <limits.h>
 			  iReader.CopyWord(1, coreImageFileName);
 			  iReader.MarkNext(); // ready for processing extension
 			  break;
 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/imgtools/romtools/rofsbuild/rofsbuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/rofsbuild.mmp	2010-05-13 19:14:23.533081838 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp	2010-05-08 15:07:32.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp	2010-05-15 14:32:45.000000000 +0100
 @@ -43,15 +43,16 @@
 USERINCLUDE   ../../imglib/inc ../../imglib/compress ../../imglib/filesystem/include
 USERINCLUDE   ../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include
 USERINCLUDE	  ../../imglib/memmap/include
 +#ifndef TOOLS2_LINUX
 #else
 STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32
 OPTION    GCC -mthreads -O2 -Wno-uninitialized
 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/imgtools/romtools/rofsbuild/r_rofs.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rofsbuild/r_rofs.cpp	2010-05-13 19:14:23.529081888 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp	2010-05-08 15:08:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -584,9 +584,10 @@
 			coffhead[0x54] = 0x20;
 			// now fill in the text segment size
 -			*(TUint32 *) (&coffhead[0x18]) = ALIGN4K(iSizeUsed);
 			os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead));
 			}
 		break;
 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/imgtools/romtools/rombuild/r_areaset.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_areaset.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rombuild/r_areaset.cpp	2010-05-13 19:14:23.533081838 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_areaset.cpp	2010-05-12 14:47:03.881119838 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_areaset.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -47,7 +47,7 @@
 Area::~Area()
 	{
 	ReleaseAllFiles();
 -	free(const_cast<char*>(iName));	// allocated with strdup()
 	}
 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/imgtools/romtools/rombuild/r_areaset.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_areaset.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rombuild/r_areaset.h	2010-05-13 19:14:23.533081838 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_areaset.h	2010-05-12 14:47:02.317600179 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_areaset.h	2010-05-15 14:32:45.000000000 +0100
 @@ -104,7 +104,7 @@
 public:
 	TRomBuilderEntry* iFirstPagedCode; // For PagedRom only
 private:
 -	const char* iName;
 	TLinAddr iDestBaseAddr;
 	TLinAddr iSrcBaseAddr;
 	TLinAddr iSrcLimitAddr;
 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/imgtools/romtools/rombuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_obey.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rombuild/r_obey.cpp	2010-05-13 19:14:23.537081787 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_obey.cpp	2010-05-08 14:50:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_obey.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -301,7 +301,7 @@
 	iCurrentLine++;
 	iCurrentMark = ftell(iObeyFile);
 	iLine[0]='\0';
 -	fgets((char*)iLine,imaxLength+1,iObeyFile);
 			iReader.CopyWord(1, coreImageFileName);
 			break;
 		}
 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/imgtools/romtools/rombuild/rombuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/rombuild.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rombuild/rombuild.mmp	2010-05-13 19:14:23.541082016 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/rombuild.mmp	2010-05-08 14:52:22.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/rombuild.mmp	2010-05-15 14:32:45.000000000 +0100
 @@ -41,7 +41,9 @@
 userinclude	../../imglib/compress 	../../imglib/inc
 userinclude	../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include
 userinclude ../../imglib/memmap/include
 +#ifndef TOOLS2_LINUX
 #else
 STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32
 OPTION    GCC -O2 -Wno-uninitialized -mthreads
 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/imgtools/romtools/rombuild/r_rom.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_rom.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/romtools/rombuild/r_rom.cpp	2010-05-13 19:14:23.541082016 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_rom.cpp	2010-05-08 14:51:46.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_rom.cpp	2010-05-15 14:32:45.000000000 +0100
 @@ -1835,7 +1835,7 @@
 			TRomFile** l=rf->iPDeps;
 			FindMarked(MARK_EXE, MARK_EXE, l);
 			TInt nx=l-rf->iPDeps;
 -			if (!e->IsDll() && (nx>1 || nx==1 && l[-1]!=rf))
 			os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead));
 			}
 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/imgtools/sisutils/inc/pkgfileparser.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkgfileparser.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/sisutils/inc/pkgfileparser.h	2010-05-13 19:14:23.545083223 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkgfileparser.h	2010-05-12 19:15:05.824830894 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkgfileparser.h	2010-05-15 14:32:45.000000000 +0100
 @@ -33,6 +33,10 @@
 #include "pkglanguage.h"
 +int CompareTwoString(wchar_t const * string ,wchar_t const * option);
 };
 #endif //__PKGFILEPARSER_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/imgtools/sisutils/inc/pkglanguage.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkglanguage.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/sisutils/inc/pkglanguage.h	2010-05-13 19:14:23.545083223 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkglanguage.h	2010-05-08 15:21:16.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkglanguage.h	2010-05-15 14:32:45.000000000 +0100
 @@ -26,7 +26,7 @@
 typedef struct
 {
 -	wchar_t*		iName;
 	unsigned long	iId;
 } SKeyword;
 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/imgtools/sisutils/inc/sis2iby.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sis2iby.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/sisutils/inc/sis2iby.h	2010-05-13 19:14:23.545083223 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sis2iby.h	2010-05-12 20:09:01.404831073 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sis2iby.h	2010-05-15 14:32:45.000000000 +0100
 @@ -38,7 +38,7 @@
 class Sis2Iby : public SisUtils
 {
 public:
 -	Sis2Iby(char* aFile);
 	~Sis2Iby();
 	void ProcessSisFile();
 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/imgtools/sisutils/inc/sisutils.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sisutils.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/sisutils/inc/sisutils.h	2010-05-13 19:14:23.545083223 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sisutils.h	2010-05-12 20:03:18.901331124 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sisutils.h	2010-05-15 14:32:45.000000000 +0100
 @@ -40,6 +40,9 @@
 #ifdef WIN32
 #define PATHSEPARATOR  "\\"
 #endif
 +#ifdef __LINUX__
 	virtual ~SisUtilsException();
 	virtual void Report();
 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/imgtools/sisutils/src/pkgfileparser.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/pkgfileparser.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/sisutils/src/pkgfileparser.cpp	2010-05-13 19:14:23.545083223 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/pkgfileparser.cpp	2010-05-12 19:35:03.692828442 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/pkgfileparser.cpp	2010-05-15 17:10:43.000000000 +0100
-@@ -18,13 +18,15 @@
+@@ -18,13 +18,16 @@
 #include "sisutils.h"
 #include "pkgfileparser.h"
 +#include <vector>
 +#include <wchar.h>
++#include <cstdlib>
 // Parse options lookups
 #define MAXTOKENLEN	30
 struct SParseToken
 {
 +	wchar_t pszOpt[MAXTOKENLEN];
 +	unsigned dwOpt;
 };
 const SParseToken KTokens[] =
-@@ -46,6 +48,10 @@
+@@ -46,6 +49,10 @@
 };
 #define NUMPARSETOKENS (sizeof(KTokens)/sizeof(SParseToken))
 +std::wstring string2wstring (const String& aNarrow);
 +String wstring2string (const std::wstring& aWide);
 +
 +
 /**
 Constructor: PkgParser class
 Initilize the parameters to data members.
-@@ -68,9 +74,9 @@
+@@ -68,9 +75,9 @@
 */
 PkgParser::~PkgParser()
 {
 -	if(iPkgHandle != INVALID_HANDLE_VALUE)
 +	if(iPkgHandle)
 -		::CloseHandle(iPkgHandle);
 +		std::fclose(iPkgHandle);
 	}
 	DeleteAll();
-@@ -84,9 +90,14 @@
+@@ -84,9 +91,14 @@
 */
 int PkgParser::OpenFile()
 {
 -	iPkgHandle = ::CreateFileW(string2wstring(iPkgFile).data(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
 +#ifdef WIN32
 -	return (iPkgHandle != INVALID_HANDLE_VALUE) ? 1 : 0;
 }
 /**
-@@ -164,7 +175,7 @@
+@@ -164,7 +176,7 @@
 {
 	if(!OpenFile())
 	{
 -		throw SisUtilsException((char*)iPkgFile.data(), "Could not open file");
 +		throw SisUtilsException(iPkgFile.c_str(),"Could not open file");
 	}
 	GetNextChar();
-@@ -273,7 +284,7 @@
+@@ -273,7 +285,7 @@
 	// process application names
 	ExpectToken('{');
 -	for (WORD wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++)
 +	for (unsigned short wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++)
 	{
 		GetNextToken ();
 		ExpectToken(QUOTED_STRING_TOKEN);
-@@ -771,7 +782,7 @@
+@@ -771,7 +783,7 @@
 */
 void PkgParser::ParseOptionsBlockL()
 {
 -	WORD wNumLangs;
 +	unsigned short wNumLangs;
 	ExpectToken('(');
 	GetNextToken ();
-@@ -838,7 +849,7 @@
+@@ -838,7 +850,7 @@
 void PkgParser::ParseVendorNameL()
 {
 	ExpectToken('{');
 -	for (WORD wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++)
 +	for (unsigned short wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++)
 	{
 		GetNextToken ();
 		ExpectToken(QUOTED_STRING_TOKEN);
-@@ -990,14 +1001,8 @@
+@@ -990,14 +1002,8 @@
 */
 void PkgParser::GetNextChar()
 {
 -#ifdef WIN32
 -	DWORD dwBytesRead;
 +	wint_t wch = std::fgetwc(iPkgHandle);
 +	m_pkgChar = (wch == WEOF) ? 0 : wch;
 }
 /**
-@@ -1105,10 +1110,10 @@
+@@ -1105,10 +1111,10 @@
 */
 bool PkgParser::GetStringToken()
 {
 -	DWORD wCount = 0;
 +	unsigned wCount = 0;
 -	DWORD escapeChars = 0;
 +	unsigned escapeChars = 0;
 	while (!finished)
 	{
-@@ -1153,15 +1158,16 @@
+@@ -1153,15 +1159,16 @@
 @internalComponent
 @released
 */
 -WORD PkgParser::ParseEscapeChars()
 +unsigned short PkgParser::ParseEscapeChars()
 +		std::fpos_t foff;
 +		std::fgetpos(iPkgHandle,&foff);
 		try
 		{
 			GetNextChar();
-@@ -1170,32 +1176,29 @@
+@@ -1170,32 +1177,29 @@
 				found++;
 			else
 			{
 -				::SetFilePointer(iPkgHandle, fileOffset, NULL, FILE_BEGIN);
 +				std::fsetpos(iPkgHandle,&foff);
 -#error "TODO: Implement this function under other OS than Windows"
 -#endif
 	return found;
 }
-@@ -1207,7 +1210,7 @@
+@@ -1207,7 +1211,7 @@
 */
 void PkgParser::GetAlphaNumericToken()
 {
 -	WORD wCount = 0;
 +	unsigned short wCount = 0;
 	while(m_pkgChar && (isalnum(m_pkgChar) || ((m_pkgChar) == '_')))
 	{
 		if(wCount < (MAX_STRING - 1))
-@@ -1232,12 +1235,13 @@
+@@ -1232,12 +1236,13 @@
 	{
 		// we may have a number but we must look ahead one char to be certain
 -		WCHAR oldChar = m_pkgChar;
 -		DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT);
 -		::SetFilePointer(iPkgHandle,fileOffset,NULL,FILE_BEGIN);
 +		std::fsetpos(iPkgHandle,&foff);
 	}
 	return lexemeIsNumber;
-@@ -1251,23 +1255,30 @@
+@@ -1251,23 +1256,30 @@
 */
 void PkgParser::GetNumericToken()
 {
 -	WCHAR temp[MAX_STRING];
 -	LPWSTR end;
 +	std::fsetpos(iPkgHandle,&foff);
 +	std::fseek(iPkgHandle,(end-temp-1) * sizeof(wchar_t),SEEK_CUR);
 	GetNextChar();
 }
-@@ -1338,13 +1349,13 @@
+@@ -1338,13 +1350,13 @@
 @param msg - error message to be thrown
 */
 -void PkgParser::ParserError(char* msg)
 +void PkgParser::ParserError(char const* msg)
 -	throw SisUtilsException("PakageFile-Parser Error", (char*)(str.str()).data());
 +	throw SisUtilsException("PackageFile-Parser Error",str.str().c_str());
 }
 /**
-@@ -1357,22 +1368,13 @@
+@@ -1357,22 +1369,13 @@
 */
 String wstring2string (const std::wstring& aWide)
 {
 -	int max = ::WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),0,0,0,0);
 -	String reply;
 	}
 +	String reply(&buffer[0]);
 	return reply;
 }
-@@ -1386,22 +1388,13 @@
+@@ -1386,22 +1389,13 @@
 */
 std::wstring string2wstring (const String& aNarrow)
 {
 -	int max = ::MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),0,0);
 -	std::wstring reply;
 	}
 +	std::wstring reply((wchar_t *)&buffer[0]);
 	return reply;
 }
-@@ -1414,9 +1407,13 @@
+@@ -1414,9 +1408,13 @@
 @param string - first string
 @param option - second string
 */
 -int CompareTwoString(wchar_t* string ,wchar_t* option)
 +int CompareTwoString(wchar_t const * string ,wchar_t const * option)
 +	return wcscasecmp(string,option);
 +#endif
 }
 /**
-@@ -1429,7 +1426,7 @@
+@@ -1429,7 +1427,7 @@
 @param option - second string
 @param len - no of wide characters to be compared
 */
 -int CompareNString(wchar_t* string ,wchar_t* option, int len)
 +int CompareNString(wchar_t const * string ,wchar_t const * option, int len)
 -	return wcsnicmp(string,option,len);
 +	return wmemcmp(string,option,len);
 }
 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/imgtools/sisutils/src/sis2iby.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sis2iby.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/sisutils/src/sis2iby.cpp	2010-05-13 19:14:23.545083223 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sis2iby.cpp	2010-05-12 20:09:54.737329069 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sis2iby.cpp	2010-05-15 17:08:28.000000000 +0100
-@@ -28,7 +28,7 @@
+@@ -18,6 +18,7 @@
+#include "sisutils.h"
+#include "sis2iby.h"
++#include <cstdlib>
+/**
+Constructor: Sis2Iby class
+@@ -28,7 +29,7 @@
 @param aFile	- SIS file name
 */
 -Sis2Iby::Sis2Iby(char* aFile) : SisUtils(aFile)
 +Sis2Iby::Sis2Iby(char const* aFile) : SisUtils(aFile)
 {
 }
-@@ -70,7 +70,7 @@
+@@ -70,7 +71,7 @@
 	if(IsVerboseMode())
 	{
 -		std::cout << "Processing " << (char*)sisFile.data() << std::endl;
 +		std::cout << "Processing " << sisFile.c_str() << std::endl;
 	}
 	if(IsFileExist(sisFile))
-@@ -86,12 +86,12 @@
+@@ -86,12 +87,12 @@
 			break;
 		case STAT_FAILURE:
 			{
 -				throw SisUtilsException((char*)sisFile.data(), "Failed to extract SIS file");
 +				throw SisUtilsException(sisFile.c_str(),"Failed to extract SIS file");
 -		throw SisUtilsException((char*)sisFile.data(), "File not found");
 +		throw SisUtilsException(sisFile.c_str(),"File not found");
 }
 /**
-@@ -128,18 +128,18 @@
+@@ -128,18 +129,18 @@
 	ibyFile.append(".iby");
 	if( !MakeDirectory(iOutputPath) )
 -		throw SisUtilsException((char*)iOutputPath.data(), "Failed to create path");
 +		throw SisUtilsException(iOutputPath.c_str(),"Failed to create path");
 -		throw SisUtilsException((char*)ibyFile.data(), "Failed to create IBY file");
 +		throw SisUtilsException(ibyFile.c_str(),"Failed to create IBY file");
 	}
 	// Generating Header
-@@ -239,10 +239,10 @@
+@@ -239,10 +240,10 @@
 			}
 		}
 		else
 -			throw SisUtilsException((char*)pkgFileName.data(), "Could not create parser object");
 +			throw SisUtilsException(pkgFileName.c_str(),"Could not create parser object");
 -		throw SisUtilsException((char*)pkgFileName.data(), "File not found");
 +		throw SisUtilsException(pkgFileName.c_str(),"File not found");
 }
 /**
-@@ -551,7 +551,12 @@
+@@ -551,7 +552,12 @@
 		aFile.assign(fPath);
 	}
 #else
 -#error "TODO: Implement this function under other OS than Windows"
 +	char fPath[FILENAME_MAX];
 +	}
 +
 #endif
 	return;
 }
-@@ -652,7 +657,7 @@
+@@ -652,7 +658,7 @@
 	if( !aIfs.is_open() )
 	{
 -		throw SisUtilsException((char*)aFile.data(), "Cannot open file");
 +		throw SisUtilsException(aFile.c_str(),"Cannot open file");
 	}
 	aIfs.seekg(0,std::ios::end);
 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/imgtools/sisutils/src/sisutils.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sisutils.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/latest_build/build/imgtools/sisutils/src/sisutils.cpp	2010-05-13 19:14:23.549082823 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sisutils.cpp	2010-05-12 20:02:59.113330633 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sisutils.cpp	2010-05-15 17:05:31.000000000 +0100
 @@ -20,6 +20,13 @@
 #include <windows.h>
 #include <direct.h>
 #endif
 +#ifdef __LINUX__
 +		{
 +			token = &*pch;
 +			args.push_back(token);
 +		}
 +	}
-+	args.push_back(NULL);
++	args.push_back((char *)NULL);
 +    pid_t pid = fork();
 +    if (pid == 0)
 +	{
 +        execv(args[0],&args[0]);
 +    }

changeset 12	5e7562f67577
parent 9	67f8bb81b054
child 14	eb060913c963