Compile fix for [2694].

4 files changed, 4 insertions, 28 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
 }
diff --git a/lib/backupstore/BackupStoreConfigVerify.cpp b/lib/backupstore/BackupStoreConfigVerify.cpp
index cc6efcf5..921adfa4 100644
--- a/lib/backupstore/BackupStoreConfigVerify.cpp
+++ b/lib/backupstore/BackupStoreConfigVerify.cpp
@@ -38,13 +38,7 @@ static const ConfigurationVerifyKey verifyrootkeys[] =
 		ConfigTest_Exists | ConfigTest_IsInt),
 	ConfigurationVerifyKey("ExtendedLogging", ConfigTest_IsBool, false),
 	// make value "yes" to enable in config file
-
-	#ifdef WIN32
-		ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry)
-	#else
-		ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry,
-			BOX_FILE_RAIDFILE_DEFAULT_CONFIG)
-	#endif
+	ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry)
 };
 
 const ConfigurationVerify BackupConfigFileVerify =