Commit 6b215b0a authored by Andreas Schuh's avatar Andreas Schuh

Use project name (gflags) within include guards to avoid conflict with…

Use project name (gflags) within include guards to avoid conflict with gperftools as reported by chen3feng (issue #62, http://code.google.com/p/gflags/issues/detail?id=62).

git-svn-id: https://gflags.googlecode.com/svn/trunk@78 6586e3c6-dcc4-952a-343f-ff74eb82781d
parent e88280ed
......@@ -75,8 +75,8 @@
// other thread is writing to the variable or calling non-const
// methods of this class.
#ifndef BASE_COMMANDLINEFLAGS_H_
#define BASE_COMMANDLINEFLAGS_H_
#ifndef GFLAGS_GFLAGS_H_
#define GFLAGS_GFLAGS_H_
#include <string>
#include <vector>
......@@ -562,4 +562,4 @@ inline clstring* dont_pass0toDEFINE_string(char *stringspot,
#endif // SWIG
#endif // BASE_COMMANDLINEFLAGS_H_
#endif // GFLAGS_GFLAGS_H_
......@@ -109,8 +109,8 @@ $ complete -o bashdefault -o default -o nospace -C \
// produce the expected completion output.
#ifndef BASE_COMMANDLINEFLAGS_COMPLETIONS_H_
#define BASE_COMMANDLINEFLAGS_COMPLETIONS_H_
#ifndef GFLAGS_COMPLETIONS_H_
#define GFLAGS_COMPLETIONS_H_
// Annoying stuff for windows -- makes sure clients can import these functions
//
......@@ -127,4 +127,4 @@ extern void HandleCommandLineCompletions(void);
@ac_google_end_namespace@
#endif // BASE_COMMANDLINEFLAGS_COMPLETIONS_H_
#endif // GFLAGS_COMPLETIONS_H_
......@@ -34,8 +34,8 @@
// This is the file that should be included by any file which declares
// command line flag.
#ifndef BASE_COMMANDLINEFLAGS_DECLARE_H_
#define BASE_COMMANDLINEFLAGS_DECLARE_H_
#ifndef GFLAGS_DECLARE_H_
#define GFLAGS_DECLARE_H_
#include <string>
#if @ac_cv_have_stdint_h@
......@@ -109,4 +109,4 @@ typedef std::string clstring;
} \
using fLS::FLAGS_##name
#endif // BASE_COMMANDLINEFLAGS_DECLARE_H_
#endif // GFLAGS_DECLARE_H_
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