Changeset 2695

Timestamp:

06/06/2010 15:30:36 (2 years ago)

Author:

chris

Message:

Compile fix for [2694].

Location:

box/trunk

Files:

• bin/bbackupquery/bbackupquery.cpp (modified) (1 diff)
• bin/bbstoreaccounts/bbstoreaccounts.cpp (modified) (1 diff)
• bin/bbstored/bbstored.cpp (modified) (1 diff)
• lib/backupstore/BackupStoreConfigVerify.cpp (modified) (1 diff)

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -175 +175 @@
 
         // 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

box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp

@@ -466 +466 @@
 
         // 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

box/trunk/bin/bbstored/bbstored.cpp

@@ -25 +25 @@
         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

box/trunk/lib/backupstore/BackupStoreConfigVerify.cpp

@@ -39 +39 @@
         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)
 };