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

git-svn-id: https://gflags.googlecode.com/svn/trunk@78 6586e3c6-dcc4-952a-343f-ff74eb82781d

diff --git a/src/gflags/gflags.h.in b/src/gflags/gflags.h.in
index c58beee..dd51a2d 100644 (file)
--- a/src/gflags/gflags.h.in
+++ b/src/gflags/gflags.h.in
@@ -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_

diff --git a/src/gflags/gflags_completions.h.in b/src/gflags/gflags_completions.h.in
index 8d6a84c..4e8c6dc 100644 (file)
--- a/src/gflags/gflags_completions.h.in
+++ b/src/gflags/gflags_completions.h.in
@@ -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_

diff --git a/src/gflags/gflags_declare.h.in b/src/gflags/gflags_declare.h.in
index 893c881..7a09381 100644 (file)
--- a/src/gflags/gflags_declare.h.in
+++ b/src/gflags/gflags_declare.h.in
@@ -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_