diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2009-01-22 17:00:58 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2009-01-22 17:00:58 +0100 |
| commit | 4d6fbb4293310d8b26dc3ab1c7758de963c87f74 (patch) | |
| tree | fa23a68a9b1fb4578c51c1ee06c89535a583a5a2 | |
| parent | 4b83954e9c06a29ac6079d95e0cff30a26422389 (diff) | |
more include fixes
| -rw-r--r-- | bin/bbackupctl/bbackupctl.cpp | 5 | ||||
| -rw-r--r-- | bin/bbackupobjdump/bbackupobjdump.cpp | 3 | ||||
| -rw-r--r-- | bin/bbackupquery/bbackupquery.cpp | 5 | ||||
| -rw-r--r-- | lib/common/Test.h | 2 | ||||
| -rw-r--r-- | lib/common/WaitForEvent.cpp | 4 | ||||
| -rw-r--r-- | lib/common/WaitForEvent.h | 4 | ||||
| -rw-r--r-- | lib/raidfile/RaidFileRead.cpp | 2 | ||||
| -rw-r--r-- | lib/raidfile/RaidFileRead.h | 3 |
8 files changed, 13 insertions, 15 deletions
diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp index 1eb3d015..d4a3668e 100644 --- a/bin/bbackupctl/bbackupctl.cpp +++ b/bin/bbackupctl/bbackupctl.cpp @@ -48,7 +48,8 @@ #include "Box.h" -#include <stdio.h> +#include <cstdio> +#include <cstdlib> #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -75,8 +76,6 @@ enum Command SyncAndWaitForEnd, }; -#include <cstdlib> - void PrintUsageAndExit() { printf("Usage: bbackupctl [-q] [-c config_file] <command>\n" diff --git a/bin/bbackupobjdump/bbackupobjdump.cpp b/bin/bbackupobjdump/bbackupobjdump.cpp index 4aba691b..83a8fce0 100644 --- a/bin/bbackupobjdump/bbackupobjdump.cpp +++ b/bin/bbackupobjdump/bbackupobjdump.cpp @@ -48,7 +48,8 @@ #include "Box.h" -#include <stdio.h> +#include <cstdio> +#include <cstring> #include "MainHelper.h" #include "FileStream.h" diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp index 3b115ac2..beda34f9 100644 --- a/bin/bbackupquery/bbackupquery.cpp +++ b/bin/bbackupquery/bbackupquery.cpp @@ -53,7 +53,8 @@ #endif #include <errno.h> -#include <stdio.h> +#include <cstdio> +#include <cstdlib> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -94,8 +95,6 @@ #include "MemLeakFindOn.h" -#include <cstdlib> - void PrintUsageAndExit() { printf("Usage: bbackupquery [-q] [-w] " diff --git a/lib/common/Test.h b/lib/common/Test.h index 6e762786..282822b0 100644 --- a/lib/common/Test.h +++ b/lib/common/Test.h @@ -61,7 +61,7 @@ #include <unistd.h> #endif -#include <string> +#include <cstring> #ifdef WIN32 #define BBACKUPCTL "..\\..\\bin\\bbackupctl\\bbackupctl.exe" diff --git a/lib/common/WaitForEvent.cpp b/lib/common/WaitForEvent.cpp index f922fe86..1f3a67d0 100644 --- a/lib/common/WaitForEvent.cpp +++ b/lib/common/WaitForEvent.cpp @@ -104,7 +104,7 @@ WaitForEvent::~WaitForEvent() #else if(mpPollInfo != 0) { - std::free(mpPollInfo); + ::free(mpPollInfo); mpPollInfo = 0; } #endif @@ -180,7 +180,7 @@ void *WaitForEvent::Wait() if(mpPollInfo == 0) { // Yes... - mpPollInfo = (struct pollfd *)std::malloc((sizeof(struct pollfd) * mItems.size()) + 4); + mpPollInfo = (struct pollfd *)::malloc((sizeof(struct pollfd) * mItems.size()) + 4); if(mpPollInfo == 0) { throw std::bad_alloc(); diff --git a/lib/common/WaitForEvent.h b/lib/common/WaitForEvent.h index 63a33b92..111665a1 100644 --- a/lib/common/WaitForEvent.h +++ b/lib/common/WaitForEvent.h @@ -59,12 +59,12 @@ #endif #endif +#include <cstdlib> + #include "CommonException.h" #include "MemLeakFindOn.h" -#include <cstdlib> - class WaitForEvent { public: diff --git a/lib/raidfile/RaidFileRead.cpp b/lib/raidfile/RaidFileRead.cpp index 8e6dd46b..3e969188 100644 --- a/lib/raidfile/RaidFileRead.cpp +++ b/lib/raidfile/RaidFileRead.cpp @@ -76,8 +76,6 @@ #include "MemLeakFindOn.h" -#include <cstdlib> - #define READ_NUMBER_DISCS_REQUIRED 3 #define READV_MAX_BLOCKS 64 diff --git a/lib/raidfile/RaidFileRead.h b/lib/raidfile/RaidFileRead.h index 083e053f..9cd3cede 100644 --- a/lib/raidfile/RaidFileRead.h +++ b/lib/raidfile/RaidFileRead.h @@ -49,7 +49,8 @@ #ifndef RAIDFILEREAD__H #define RAIDFILEREAD__H -#include <string> +#include <cstring> +#include <cstdlib> #include <memory> #include <vector> |