Skip to content

G
gflags
Commit 7b63ae8f authored by Andreas Schuh's avatar Andreas Schuh
Browse files
Options

Fix preprocessor conditions to use new GFLAGS_* defines.

parent 9b3c4a81
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/gflags.cc
View file @ 7b63ae8f
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_FNMATCH_H #ifdef GFLAGS_HAVE_FNMATCH_H
# include <fnmatch.h> # include <fnmatch.h>
#endif #endif
#include <stdarg.h> // For va_list and related operations #include <stdarg.h> // For va_list and related operations
...@@ -1307,7 +1307,7 @@ string CommandLineFlagParser::ProcessOptionsFromStringLocked( ...@@ -1307,7 +1307,7 @@ string CommandLineFlagParser::ProcessOptionsFromStringLocked(
// We try matching both against the full argv0 and basename(argv0) // We try matching both against the full argv0 and basename(argv0)
if (glob == ProgramInvocationName() // small optimization if (glob == ProgramInvocationName() // small optimization
|| glob == ProgramInvocationShortName() || glob == ProgramInvocationShortName()
#if HAVE_FNMATCH_H #ifdef GFLAGS_HAVE_FNMATCH_H
|| fnmatch(glob.c_str(), || fnmatch(glob.c_str(),
ProgramInvocationName(), ProgramInvocationName(),
FNM_PATHNAME) == 0 FNM_PATHNAME) == 0
......
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