diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common/Test.cpp | 2 | ||||
| -rw-r--r-- | lib/common/Test.h | 2 | ||||
| -rw-r--r-- | lib/raidfile/RaidFileUtil.h | 2 | ||||
| -rw-r--r-- | lib/server/ServerControl.cpp | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/lib/common/Test.cpp b/lib/common/Test.cpp index e903f41e..787cf0a2 100644 --- a/lib/common/Test.cpp +++ b/lib/common/Test.cpp @@ -416,7 +416,7 @@ void terminate_bbackupd(int pid) // Wait a given number of seconds for something to complete -void wait_for_operation(int seconds, char* message) +void wait_for_operation(int seconds, const char* message) { if (Logging::GetGlobalLevel() >= Log::TRACE) { diff --git a/lib/common/Test.h b/lib/common/Test.h index 344af979..ce967041 100644 --- a/lib/common/Test.h +++ b/lib/common/Test.h @@ -158,7 +158,7 @@ void sync_and_wait(); void terminate_bbackupd(int pid); // Wait a given number of seconds for something to complete -void wait_for_operation(int seconds, char* message); +void wait_for_operation(int seconds, const char* message); void safe_sleep(int seconds); #endif // TEST__H diff --git a/lib/raidfile/RaidFileUtil.h b/lib/raidfile/RaidFileUtil.h index 16670bf1..a581047c 100644 --- a/lib/raidfile/RaidFileUtil.h +++ b/lib/raidfile/RaidFileUtil.h @@ -37,7 +37,7 @@ public: AsRaidWithMissingNotRecoverable = 4 } ExistType; - typedef enum + enum { Stripe1Exists = 1, Stripe2Exists = 2, diff --git a/lib/server/ServerControl.cpp b/lib/server/ServerControl.cpp index c4668b57..b9650cee 100644 --- a/lib/server/ServerControl.cpp +++ b/lib/server/ServerControl.cpp @@ -1,6 +1,7 @@ #include "Box.h" #include <errno.h> +#include <stdio.h> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> |