diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2013-09-30 08:28:58 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2013-09-30 08:28:58 +0000 |
| commit | dae6303135c66acdd0e4f3985c6e5c95334aea7f (patch) | |
| tree | 173acec5f3e34ef870f4e283c7403e10b097cd0e /bin | |
| parent | caa198fee3d6a9df3d2fbed4923b4b8ad554c706 (diff) | |
Fix getopt header confusion.
Our copy of getopt.h in lib/win32 was beating the system getopt.h in the
search path, and providing different definitions, which clang picked up.
Renamed our getopt.h to bsd_getopt.h, and added a box_getopt.h to decide
whether to include this one instead of the system getopt.h.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/bbackupctl/bbackupctl.cpp | 1 | ||||
| -rw-r--r-- | bin/bbstoreaccounts/bbstoreaccounts.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp index 39f15baf..643f0e8c 100644 --- a/bin/bbackupctl/bbackupctl.cpp +++ b/bin/bbackupctl/bbackupctl.cpp @@ -18,6 +18,7 @@ #include <cstdlib> +#include "box_getopt.h" #include "MainHelper.h" #include "BoxPortsAndFiles.h" #include "BackupDaemonConfigVerify.h" diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp index 6a5c2e33..f2292ca1 100644 --- a/bin/bbstoreaccounts/bbstoreaccounts.cpp +++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp @@ -24,6 +24,7 @@ #include <ostream> #include <vector> +#include "box_getopt.h" #include "BackupStoreAccounts.h" #include "BackupStoreAccountDatabase.h" #include "BackupStoreCheck.h" |