diff options
author | Reinhard Tartler <siretart@tauware.de> | 2009-03-31 21:41:41 +0200 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2009-03-31 21:41:41 +0200 |
commit | 517fd52f320f008e23292c00759a39cec42e2ee0 (patch) | |
tree | de564ea4898ec973de4ae5e27749d0b932f08340 /debian/patches | |
parent | d2183f09d77e298a9119cb523b9be801ecc08865 (diff) |
add 02-gcc-4.4-fixes.diff as quilt patch, unapply from source tree
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/02-gcc-4.4-fixes.diff | 272 |
1 files changed, 272 insertions, 0 deletions
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> |