summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2010-06-06 14:30:36 +0000
committerChris Wilson <chris+github@qwirx.com>2010-06-06 14:30:36 +0000
commit90ce1105466ef4f09c3370344c55ae9710d38f9f (patch)
tree1551098486ae380b33d2fd11ea573529ca0f5bf7 /bin
parenta781743ecbb955be9e17d47a5714b19f1e17205d (diff)
Compile fix for [2694].
Diffstat (limited to 'bin')
-rw-r--r--bin/bbackupquery/bbackupquery.cpp8
-rw-r--r--bin/bbstoreaccounts/bbstoreaccounts.cpp8
-rw-r--r--bin/bbstored/bbstored.cpp8
3 files changed, 3 insertions, 21 deletions
diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp
index f004310c..ed1d78f6 100644
--- a/bin/bbackupquery/bbackupquery.cpp
+++ b/bin/bbackupquery/bbackupquery.cpp
@@ -174,13 +174,7 @@ int main(int argc, const char *argv[])
FILE *logFile = 0;
// Filename for configuration file?
- std::string configFilename;
-
- #ifdef WIN32
- configFilename = BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE;
- #else
- configFilename = BOX_FILE_BBACKUPD_DEFAULT_CONFIG;
- #endif
+ std::string configFilename = BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE;
// Flags
bool readWrite = false;
diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp
index a9d2b0af..afbc645c 100644
--- a/bin/bbstoreaccounts/bbstoreaccounts.cpp
+++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp
@@ -465,13 +465,7 @@ int main(int argc, const char *argv[])
Logging::SetProgramName("bbstoreaccounts");
// Filename for configuration file?
- std::string configFilename;
-
- #ifdef WIN32
- configFilename = BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE;
- #else
- configFilename = BOX_FILE_BBSTORED_DEFAULT_CONFIG;
- #endif
+ std::string configFilename = BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE;
// See if there's another entry on the command line
int c;
diff --git a/bin/bbstored/bbstored.cpp b/bin/bbstored/bbstored.cpp
index 21a9e5f1..a0325d21 100644
--- a/bin/bbstored/bbstored.cpp
+++ b/bin/bbstored/bbstored.cpp
@@ -24,13 +24,7 @@ int main(int argc, const char *argv[])
BackupStoreDaemon daemon;
- #ifdef WIN32
- return daemon.Main(BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE,
- argc, argv);
- #else
- return daemon.Main(BOX_FILE_BBSTORED_DEFAULT_CONFIG,
- argc, argv);
- #endif
+ return daemon.Main(BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE, argc, argv);
MAINHELPER_END
}