add 02-gcc-4.4-fixes.diff as quilt patch, unapply from source tree

17 files changed, 286 insertions, 33 deletions

diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp
index fdd67d5e..3795cbed 100644
--- a/bin/bbackupctl/bbackupctl.cpp
+++ b/bin/bbackupctl/bbackupctl.cpp
@@ -9,8 +9,7 @@
 
 #include "Box.h"
 
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
 
 #ifdef HAVE_UNISTD_H
 	#include <unistd.h>
diff --git a/bin/bbackupobjdump/bbackupobjdump.cpp b/bin/bbackupobjdump/bbackupobjdump.cpp
index 5b6c44f7..74fff510 100644
--- a/bin/bbackupobjdump/bbackupobjdump.cpp
+++ b/bin/bbackupobjdump/bbackupobjdump.cpp
@@ -9,8 +9,7 @@
 
 #include "Box.h"
 
-#include <cstdio>
-#include <cstring>
+#include <stdio.h>
 
 #include "MainHelper.h"
 #include "FileStream.h"
diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp
index 0098953f..c9d6b715 100644
--- a/bin/bbackupquery/bbackupquery.cpp
+++ b/bin/bbackupquery/bbackupquery.cpp
@@ -14,8 +14,7 @@
 #endif
 
 #include <errno.h>
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
 
 #ifdef HAVE_SYS_TYPES_H
 	#include <sys/types.h>
diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp
index 1f10d04b..6f079d30 100644
--- a/bin/bbstoreaccounts/bbstoreaccounts.cpp
+++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp
@@ -30,8 +30,6 @@
 
 #include "MemLeakFindOn.h"
 
-#include <cstring>
-
 // max size of soft limit as percent of hard limit
 #define MAX_SOFT_LIMIT_SIZE		97
 
diff --git a/debian/patches/02-gcc-4.4-fixes.diff b/debian/patches/02-gcc-4.4-fixes.diff
new file mode 100644
index 00000000..431d1405
--- /dev/null
+++ b/debian/patches/02-gcc-4.4-fixes.diff
@@ -0,0 +1,272 @@
+=== modified file 'bin/bbackupobjdump/bbackupobjdump.cpp'
+--- old/bin/bbackupobjdump/bbackupobjdump.cpp	2009-03-31 13:58:19 +0000
++++ new/bin/bbackupobjdump/bbackupobjdump.cpp	2009-03-31 13:58:21 +0000
+@@ -9,7 +9,8 @@
+ 
+ #include "Box.h"
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ #include "MainHelper.h"
+ #include "FileStream.h"
+
+=== modified file 'bin/bbackupquery/bbackupquery.cpp'
+--- old/bin/bbackupquery/bbackupquery.cpp	2009-03-31 13:58:19 +0000
++++ new/bin/bbackupquery/bbackupquery.cpp	2009-03-31 13:58:21 +0000
+@@ -14,7 +14,8 @@
+ #endif
+ 
+ #include <errno.h>
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
+ 
+ #ifdef HAVE_SYS_TYPES_H
+ 	#include <sys/types.h>
+
+=== modified file 'bin/bbstoreaccounts/bbstoreaccounts.cpp'
+--- old/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-03-31 13:58:19 +0000
++++ new/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-03-31 13:58:21 +0000
+@@ -30,6 +30,8 @@
+ 
+ #include "MemLeakFindOn.h"
+ 
++#include <cstring>
++
+ // max size of soft limit as percent of hard limit
+ #define MAX_SOFT_LIMIT_SIZE		97
+ 
+
+=== modified file 'lib/backupclient/BackupClientFileAttributes.cpp'
+--- old/lib/backupclient/BackupClientFileAttributes.cpp	2009-03-31 13:58:19 +0000
++++ new/lib/backupclient/BackupClientFileAttributes.cpp	2009-03-31 13:58:21 +0000
+@@ -25,6 +25,8 @@
+ #include <sys/xattr.h>
+ #endif
+ 
++#include <cstring>
++
+ #include "BackupClientFileAttributes.h"
+ #include "CommonException.h"
+ #include "FileModificationTime.h"
+
+=== modified file 'lib/backupclient/BackupStoreFile.h'
+--- old/lib/backupclient/BackupStoreFile.h	2009-03-31 13:58:19 +0000
++++ new/lib/backupclient/BackupStoreFile.h	2009-03-31 13:58:21 +0000
+@@ -15,6 +15,7 @@
+ #include "BackupStoreFilename.h"
+ 
+ #include <memory>
++#include <cstdlib>
+ 
+ typedef struct 
+ {
+
+=== modified file 'lib/backupclient/BackupStoreFileDiff.cpp'
+--- old/lib/backupclient/BackupStoreFileDiff.cpp	2009-03-31 13:58:19 +0000
++++ new/lib/backupclient/BackupStoreFileDiff.cpp	2009-03-31 13:58:21 +0000
+@@ -33,6 +33,8 @@
+ 
+ #include "MemLeakFindOn.h"
+ 
++#include <cstring>
++
+ using namespace BackupStoreFileCryptVar;
+ using namespace BackupStoreFileCreation;
+ 
+
+=== modified file 'lib/backupclient/BackupStoreFileEncodeStream.cpp'
+--- old/lib/backupclient/BackupStoreFileEncodeStream.cpp	2009-03-31 13:58:19 +0000
++++ new/lib/backupclient/BackupStoreFileEncodeStream.cpp	2009-03-31 13:58:21 +0000
+@@ -24,6 +24,8 @@
+ 
+ #include "MemLeakFindOn.h"
+ 
++#include <cstring>
++
+ using namespace BackupStoreFileCryptVar;
+ 
+ 
+
+=== modified file 'lib/common/Configuration.cpp'
+--- old/lib/common/Configuration.cpp	2009-03-31 13:58:19 +0000
++++ new/lib/common/Configuration.cpp	2009-03-31 13:58:22 +0000
+@@ -19,6 +19,8 @@
+ 
+ #include "MemLeakFindOn.h"
+ 
++#include <cstring>
++
+ // utility whitespace function
+ inline bool iw(int c)
+ {
+
+=== modified file 'lib/common/DebugMemLeakFinder.cpp'
+--- old/lib/common/DebugMemLeakFinder.cpp	2009-03-31 13:58:19 +0000
++++ new/lib/common/DebugMemLeakFinder.cpp	2009-03-31 13:58:22 +0000
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <set>
++#include <cstdlib> // for std::atexit
+ 
+ #include "MemLeakFinder.h"
+ 
+@@ -123,7 +124,7 @@ void *memleakfinder_malloc(size_t size, 
+ {
+ 	InternalAllocGuard guard;
+ 
+-	void *b = ::malloc(size);
++	void *b = std::malloc(size);
+ 	if(!memleakfinder_global_enable) return b;
+ 	if(!memleakfinder_initialised)   return b;
+ 
+@@ -139,7 +140,7 @@ void *memleakfinder_realloc(void *ptr, s
+ 
+ 	if(!memleakfinder_global_enable || !memleakfinder_initialised)
+ 	{
+-		return ::realloc(ptr, size);
++		return std::realloc(ptr, size);
+ 	}
+ 
+ 	// Check it's been allocated
+@@ -149,7 +150,7 @@ void *memleakfinder_realloc(void *ptr, s
+ 		TRACE1("Block %x realloc(), but not in list. Error? Or allocated in startup static objects?\n", ptr);
+ 	}
+ 
+-	void *b = ::realloc(ptr, size);
++	void *b = std::realloc(ptr, size);
+ 
+ 	if(ptr && i!=sMallocBlocks.end())
+ 	{
+@@ -204,7 +205,7 @@ void memleakfinder_free(void *ptr)
+ 	}
+ 
+ 	//TRACE1("free(), %08x\n", ptr);
+-	::free(ptr);
++	std::free(ptr);
+ }
+ 
+ 
+@@ -394,7 +395,7 @@ void memleakfinder_setup_exit_report(con
+ 	::strcpy(atexit_markertext, markertext);
+ 	if(!atexit_registered)
+ 	{
+-		atexit(memleakfinder_atexit);
++		std::atexit(memleakfinder_atexit);
+ 		atexit_registered = true;
+ 	}
+ }
+@@ -458,7 +459,7 @@ static void *internal_new(size_t size, c
+ 
+ 	{
+ 		InternalAllocGuard guard;
+-		r = ::malloc(size);
++		r = std::malloc(size);
+ 	}
+ 	
+ 	if (sInternalAllocDepth == 0)
+@@ -501,7 +502,7 @@ void internal_delete(void *ptr)
+ {
+ 	InternalAllocGuard guard;
+ 
+-	::free(ptr);
++	std::free(ptr);
+ 	remove_object_block(ptr);
+ 	//TRACE1("delete[]() called, %08x\n", ptr);
+ }
+
+=== modified file 'lib/common/MemLeakFinder.h'
+--- old/lib/common/MemLeakFinder.h	2009-03-31 13:58:19 +0000
++++ new/lib/common/MemLeakFinder.h	2009-03-31 13:58:22 +0000
+@@ -12,7 +12,7 @@
+ 
+ #ifdef MEMLEAKFINDER_FULL_MALLOC_MONITORING
+ 	// include stdlib now, to avoid problems with having the macros defined already
+-	#include <stdlib.h>
++	#include <cstdlib>
+ #endif
+ 
+ // global enable flag
+
+=== modified file 'lib/common/StreamableMemBlock.cpp'
+--- old/lib/common/StreamableMemBlock.cpp	2009-03-31 13:58:19 +0000
++++ new/lib/common/StreamableMemBlock.cpp	2009-03-31 13:58:22 +0000
+@@ -10,7 +10,7 @@
+ #include "Box.h"
+ 
+ #include <new>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string.h>
+ 
+ #include "StreamableMemBlock.h"
+
+=== modified file 'lib/common/Test.h'
+--- old/lib/common/Test.h	2009-03-31 13:58:19 +0000
++++ new/lib/common/Test.h	2009-03-31 13:58:22 +0000
+@@ -22,7 +22,7 @@
+ 	#include <unistd.h>
+ #endif
+ 
+-#include <string>
++#include <cstring>
+ 
+ #ifdef WIN32
+ #define BBACKUPCTL      "..\\..\\bin\\bbackupctl\\bbackupctl.exe"
+
+=== modified file 'lib/common/Timer.cpp'
+--- old/lib/common/Timer.cpp	2009-03-31 13:58:19 +0000
++++ new/lib/common/Timer.cpp	2009-03-31 13:58:22 +0000
+@@ -11,6 +11,7 @@
+ #include "Box.h"
+ 
+ #include <signal.h>
++#include <string.h>
+ 
+ #include "Timer.h"
+ #include "Logging.h"
+
+=== modified file 'lib/common/WaitForEvent.h'
+--- old/lib/common/WaitForEvent.h	2009-03-31 13:58:19 +0000
++++ new/lib/common/WaitForEvent.h	2009-03-31 13:58:22 +0000
+@@ -20,6 +20,8 @@
+ 	#endif
+ #endif
+ 
++#include <cstdlib>
++
+ #include "CommonException.h"
+ 
+ #include "MemLeakFindOn.h"
+
+=== modified file 'lib/raidfile/RaidFileRead.h'
+--- old/lib/raidfile/RaidFileRead.h	2009-03-31 13:58:19 +0000
++++ new/lib/raidfile/RaidFileRead.h	2009-03-31 13:58:22 +0000
+@@ -10,7 +10,8 @@
+ #ifndef RAIDFILEREAD__H
+ #define RAIDFILEREAD__H
+ 
+-#include <string>
++#include <cstring>
++#include <cstdlib>
+ #include <memory>
+ #include <vector>
+ 
+
+=== modified file 'lib/common/Logging.cpp'
+--- old/lib/common/Logging.cpp	2009-03-31 13:58:19 +0000
++++ new/lib/common/Logging.cpp	2009-03-31 13:58:22 +0000
+@@ -11,6 +11,10 @@
+ 
+ #include <errno.h>
+ #include <time.h>
++#include <string.h> // for stderror
++
++// c.f. http://bugs.debian.org/512510
++#include <cstdio>
+ 
+ #ifdef HAVE_SYSLOG_H
+ 	#include <syslog.h>
diff --git a/lib/backupclient/BackupClientFileAttributes.cpp b/lib/backupclient/BackupClientFileAttributes.cpp
index c49da216..3ffeb189 100644
--- a/lib/backupclient/BackupClientFileAttributes.cpp
+++ b/lib/backupclient/BackupClientFileAttributes.cpp
@@ -25,8 +25,6 @@
 #include <sys/xattr.h>
 #endif
 
-#include <cstring>
-
 #include "BackupClientFileAttributes.h"
 #include "CommonException.h"
 #include "FileModificationTime.h"
diff --git a/lib/backupclient/BackupStoreFile.h b/lib/backupclient/BackupStoreFile.h
index 042c70a2..3ee5ddb0 100644
--- a/lib/backupclient/BackupStoreFile.h
+++ b/lib/backupclient/BackupStoreFile.h
@@ -15,7 +15,6 @@
 #include "BackupStoreFilename.h"
 
 #include <memory>
-#include <cstdlib>
 
 typedef struct 
 {
diff --git a/lib/backupclient/BackupStoreFileDiff.cpp b/lib/backupclient/BackupStoreFileDiff.cpp
index 69698083..f7842a0b 100644
--- a/lib/backupclient/BackupStoreFileDiff.cpp
+++ b/lib/backupclient/BackupStoreFileDiff.cpp
@@ -33,8 +33,6 @@
 
 #include "MemLeakFindOn.h"
 
-#include <cstring>
-
 using namespace BackupStoreFileCryptVar;
 using namespace BackupStoreFileCreation;
 
diff --git a/lib/backupclient/BackupStoreFileEncodeStream.cpp b/lib/backupclient/BackupStoreFileEncodeStream.cpp
index 978d3d23..423c11a3 100644
--- a/lib/backupclient/BackupStoreFileEncodeStream.cpp
+++ b/lib/backupclient/BackupStoreFileEncodeStream.cpp
@@ -24,8 +24,6 @@
 
 #include "MemLeakFindOn.h"
 
-#include <cstring>
-
 using namespace BackupStoreFileCryptVar;
 
 
diff --git a/lib/common/Configuration.cpp b/lib/common/Configuration.cpp
index a8199dfc..4d76e0e0 100644
--- a/lib/common/Configuration.cpp
+++ b/lib/common/Configuration.cpp
@@ -19,8 +19,6 @@
 
 #include "MemLeakFindOn.h"
 
-#include <cstring>
-
 // utility whitespace function
 inline bool iw(int c)
 {
diff --git a/lib/common/DebugMemLeakFinder.cpp b/lib/common/DebugMemLeakFinder.cpp
index 443a2976..87cdf00d 100644
--- a/lib/common/DebugMemLeakFinder.cpp
+++ b/lib/common/DebugMemLeakFinder.cpp
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <set>
-#include <cstdlib> // for std::atexit
 
 #include "MemLeakFinder.h"
 
@@ -124,7 +123,7 @@ void *memleakfinder_malloc(size_t size, const char *file, int line)
 {
 	InternalAllocGuard guard;
 
-	void *b = std::malloc(size);
+	void *b = ::malloc(size);
 	if(!memleakfinder_global_enable) return b;
 	if(!memleakfinder_initialised)   return b;
 
@@ -140,7 +139,7 @@ void *memleakfinder_realloc(void *ptr, size_t size)
 
 	if(!memleakfinder_global_enable || !memleakfinder_initialised)
 	{
-		return std::realloc(ptr, size);
+		return ::realloc(ptr, size);
 	}
 
 	// Check it's been allocated
@@ -150,7 +149,7 @@ void *memleakfinder_realloc(void *ptr, size_t size)
 		TRACE1("Block %x realloc(), but not in list. Error? Or allocated in startup static objects?\n", ptr);
 	}
 
-	void *b = std::realloc(ptr, size);
+	void *b = ::realloc(ptr, size);
 
 	if(ptr && i!=sMallocBlocks.end())
 	{
@@ -205,7 +204,7 @@ void memleakfinder_free(void *ptr)
 	}
 
 	//TRACE1("free(), %08x\n", ptr);
-	std::free(ptr);
+	::free(ptr);
 }
 
 
@@ -395,7 +394,7 @@ void memleakfinder_setup_exit_report(const char *filename, const char *markertex
 	::strcpy(atexit_markertext, markertext);
 	if(!atexit_registered)
 	{
-		std::atexit(memleakfinder_atexit);
+		atexit(memleakfinder_atexit);
 		atexit_registered = true;
 	}
 }
@@ -459,7 +458,7 @@ static void *internal_new(size_t size, const char *file, int line)
 
 	{
 		InternalAllocGuard guard;
-		r = std::malloc(size);
+		r = ::malloc(size);
 	}
 	
 	if (sInternalAllocDepth == 0)
@@ -502,7 +501,7 @@ void internal_delete(void *ptr)
 {
 	InternalAllocGuard guard;
 
-	std::free(ptr);
+	::free(ptr);
 	remove_object_block(ptr);
 	//TRACE1("delete[]() called, %08x\n", ptr);
 }
diff --git a/lib/common/MemLeakFinder.h b/lib/common/MemLeakFinder.h
index ca207bd5..450d42f8 100644
--- a/lib/common/MemLeakFinder.h
+++ b/lib/common/MemLeakFinder.h
@@ -12,7 +12,7 @@
 
 #ifdef MEMLEAKFINDER_FULL_MALLOC_MONITORING
 	// include stdlib now, to avoid problems with having the macros defined already
-	#include <cstdlib>
+	#include <stdlib.h>
 #endif
 
 // global enable flag
diff --git a/lib/common/StreamableMemBlock.cpp b/lib/common/StreamableMemBlock.cpp
index cf431022..7700152d 100644
--- a/lib/common/StreamableMemBlock.cpp
+++ b/lib/common/StreamableMemBlock.cpp
@@ -10,7 +10,7 @@
 #include "Box.h"
 
 #include <new>
-#include <cstdlib>
+#include <stdlib.h>
 #include <string.h>
 
 #include "StreamableMemBlock.h"
diff --git a/lib/common/Test.h b/lib/common/Test.h
index 6b142c8c..49b0ac66 100644
--- a/lib/common/Test.h
+++ b/lib/common/Test.h
@@ -22,7 +22,7 @@
 	#include <unistd.h>
 #endif
 
-#include <cstring>
+#include <string>
 
 #ifdef WIN32
 #define BBACKUPCTL      "..\\..\\bin\\bbackupctl\\bbackupctl.exe"
diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp
index 236f1a1b..16133ecc 100644
--- a/lib/common/Timer.cpp
+++ b/lib/common/Timer.cpp
@@ -11,7 +11,6 @@
 #include "Box.h"
 
 #include <signal.h>
-#include <string.h>
 
 #include "Timer.h"
 #include "Logging.h"
diff --git a/lib/common/WaitForEvent.h b/lib/common/WaitForEvent.h
index 1915f0bc..52a073e9 100644
--- a/lib/common/WaitForEvent.h
+++ b/lib/common/WaitForEvent.h
@@ -20,8 +20,6 @@
 	#endif
 #endif
 
-#include <cstdlib>
-
 #include "CommonException.h"
 
 #include "MemLeakFindOn.h"
diff --git a/lib/raidfile/RaidFileRead.h b/lib/raidfile/RaidFileRead.h
index 8a04409d..93bf7388 100644
--- a/lib/raidfile/RaidFileRead.h
+++ b/lib/raidfile/RaidFileRead.h
@@ -10,8 +10,7 @@
 #ifndef RAIDFILEREAD__H
 #define RAIDFILEREAD__H
 
-#include <cstring>
-#include <cstdlib>
+#include <string>
 #include <memory>
 #include <vector>