Commit 2c49763b authored by Matt Hargett's avatar Matt Hargett Committed by Andreas Schuh

Fix build on some clang variants

Some platforms' yval.h defines restrict as a macro when using clang, which causes this file to not compile.
parent 660603a3
...@@ -296,10 +296,10 @@ static void ShowUsageWithFlagsMatching(const char *argv0, ...@@ -296,10 +296,10 @@ static void ShowUsageWithFlagsMatching(const char *argv0,
} }
} }
void ShowUsageWithFlagsRestrict(const char *argv0, const char *restrict) { void ShowUsageWithFlagsRestrict(const char *argv0, const char *restrict_) {
vector<string> substrings; vector<string> substrings;
if (restrict != NULL && *restrict != '\0') { if (restrict_ != NULL && *restrict_ != '\0') {
substrings.push_back(restrict); substrings.push_back(restrict_);
} }
ShowUsageWithFlagsMatching(argv0, substrings); ShowUsageWithFlagsMatching(argv0, substrings);
} }
...@@ -389,8 +389,8 @@ void HandleCommandLineHelpFlags() { ...@@ -389,8 +389,8 @@ void HandleCommandLineHelpFlags() {
gflags_exitfunc(1); gflags_exitfunc(1);
} else if (!FLAGS_helpon.empty()) { } else if (!FLAGS_helpon.empty()) {
string restrict = PATH_SEPARATOR + FLAGS_helpon + "."; string restrict_ = PATH_SEPARATOR + FLAGS_helpon + ".";
ShowUsageWithFlagsRestrict(progname, restrict.c_str()); ShowUsageWithFlagsRestrict(progname, restrict_.c_str());
gflags_exitfunc(1); gflags_exitfunc(1);
} else if (!FLAGS_helpmatch.empty()) { } else if (!FLAGS_helpmatch.empty()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment