summaryrefslogtreecommitdiff
path: root/lib/common
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2008-07-24 15:16:32 +0200
committerReinhard Tartler <siretart@tauware.de>2008-07-24 15:16:32 +0200
commita6562e5c53162fe92884438c74226c10def2cc8b (patch)
tree3ea3df5f7fb4d6e30182ccd9617c30e2170152de /lib/common
parent3673cf0fd1f41648bb4827f450f1e60e3db90517 (diff)
import boxbackup_0.11~rc2-1.dsc
Diffstat (limited to 'lib/common')
-rwxr-xr-xlib/common/BoxPortsAndFiles.h6
-rw-r--r--lib/common/Configuration.cpp2
-rw-r--r--lib/common/WaitForEvent.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/common/BoxPortsAndFiles.h b/lib/common/BoxPortsAndFiles.h
index ffd353bf..f982e675 100755
--- a/lib/common/BoxPortsAndFiles.h
+++ b/lib/common/BoxPortsAndFiles.h
@@ -70,9 +70,9 @@
#define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \
GetDefaultConfigFilePath("bbstored.conf").c_str()
#else
-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/boxbackup/bbackupd.conf"
-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/boxbackup/raidfile.conf"
-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/boxbackup/bbstored.conf"
+#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/boxbackup/bbackupd.conf"
+#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/boxbackup/raidfile.conf"
+#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/boxbackup/bbstored.conf"
#endif
#endif // BOXPORTSANDFILES__H
diff --git a/lib/common/Configuration.cpp b/lib/common/Configuration.cpp
index 66702d55..ba84ea48 100644
--- a/lib/common/Configuration.cpp
+++ b/lib/common/Configuration.cpp
@@ -58,6 +58,8 @@
#include "MemLeakFindOn.h"
+#include <cstring>
+
// utility whitespace function
inline bool iw(int c)
{
diff --git a/lib/common/WaitForEvent.h b/lib/common/WaitForEvent.h
index cb62b8a9..63a33b92 100644
--- a/lib/common/WaitForEvent.h
+++ b/lib/common/WaitForEvent.h
@@ -63,6 +63,8 @@
#include "MemLeakFindOn.h"
+#include <cstdlib>
+
class WaitForEvent
{
public: