Changeset 2694 for box/trunk/bin

Timestamp:

06/06/2010 15:18:51 (2 years ago)

Author:

chris

Message:

Replace BOX_FILE_BBACKUPD_DEFAULT_CONFIG with
BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE.

Location:

box/trunk/bin

Files:

• bbackupctl/bbackupctl.cpp (modified) (1 diff)
• bbackupd/bbackupd.cpp (modified) (1 diff)

box/trunk/bin/bbackupctl/bbackupctl.cpp

@@ -68 +68 @@
 
         // 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;
         
         // Quiet?

box/trunk/bin/bbackupd/bbackupd.cpp

@@ -47 +47 @@
 
         BackupDaemon daemon;
-        ExitCode = daemon.Main(BOX_FILE_BBACKUPD_DEFAULT_CONFIG, argc, argv);
+        ExitCode = daemon.Main(BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE,
+                argc, argv);
 
 #endif // WIN32