Modify include guards to avoid a conflict.

BUG=None
TEST=Manual

Review URL: http://codereview.appspot.com/5305042

23 files changed, 71 insertions, 71 deletions

diff --git a/src/PyZyBopomofo.h b/src/PyZyBopomofo.h
index 9bec911..c376796 100644
--- a/src/PyZyBopomofo.h
+++ b/src/PyZyBopomofo.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __BOPOMOFO_H_
-#define __BOPOMOFO_H_
+#ifndef __PYZY_BOPOMOFO_H_
+#define __PYZY_BOPOMOFO_H_
 
 #define MAX_BOPOMOFO_LEN (4)
 
@@ -78,4 +78,4 @@ const static wchar_t bopomofo_char[] = {
     L'ˊ', L'ˇ', L'ˋ', L'˙',
 };
 
-#endif /* __BOPOMOFO_H_ */
+#endif /* __PYZY_BOPOMOFO_H_ */
diff --git a/src/PyZyBopomofoContext.h b/src/PyZyBopomofoContext.h
index ca0cc85..2d0b61b 100644
--- a/src/PyZyBopomofoContext.h
+++ b/src/PyZyBopomofoContext.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __BOPOMOFO_CONTEXT_H_
-#define __BOPOMOFO_CONTEXT_H_
+#ifndef __PYZY_BOPOMOFO_CONTEXT_H_
+#define __PYZY_BOPOMOFO_CONTEXT_H_
 
 #include "PyZyPhoneticContext.h"
 
@@ -67,4 +67,4 @@ protected:
 
 };
 
-#endif  // __BOPOMOFO_CONTEXT_H_
+#endif  // __PYZY_BOPOMOFO_CONTEXT_H_
diff --git a/src/PyZyBopomofoKeyboard.h b/src/PyZyBopomofoKeyboard.h
index c64b148..996fb64 100644
--- a/src/PyZyBopomofoKeyboard.h
+++ b/src/PyZyBopomofoKeyboard.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __BOPOMOFO_KEYBOARD_H_
-#define __BOPOMOFO_KEYBOARD_H_
+#ifndef __PYZY_BOPOMOFO_KEYBOARD_H_
+#define __PYZY_BOPOMOFO_KEYBOARD_H_
 
 #include "PyZyBopomofo.h"
 
@@ -201,4 +201,4 @@ bopomofo_keyboard[][41][2] = {
     },
 };
 
-#endif // __BOPOMOFO_KEYBOARD_H_
+#endif // __PYZY_BOPOMOFO_KEYBOARD_H_
diff --git a/src/PyZyConfig.h b/src/PyZyConfig.h
index 6f2d041..0a2c5fe 100644
--- a/src/PyZyConfig.h
+++ b/src/PyZyConfig.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __CONFIG_H_
-#define __CONFIG_H_
+#ifndef __PYZY_CONFIG_H_
+#define __PYZY_CONFIG_H_
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -94,4 +94,4 @@ private:
 
 };  // namespace PyZy
 
-#endif  // __CONFIG_H_
+#endif  // __PYZY_CONFIG_H_
diff --git a/src/PyZyDatabase.h b/src/PyZyDatabase.h
index a88e83e..93d16b4 100644
--- a/src/PyZyDatabase.h
+++ b/src/PyZyDatabase.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __DATABASE_H_
-#define __DATABASE_H_
+#ifndef __PYZY_DATABASE_H_
+#define __PYZY_DATABASE_H_
 
 #include "PyZyUtil.h"
 #include "PyZyString.h"
@@ -112,4 +112,4 @@ private:
 
 };  // namespace PyZy
 
-#endif  // __DATABASE_H_
+#endif  // __PYZY_DATABASE_H_
diff --git a/src/PyZyDoublePinyinContext.h b/src/PyZyDoublePinyinContext.h
index 50b8023..af5e941 100644
--- a/src/PyZyDoublePinyinContext.h
+++ b/src/PyZyDoublePinyinContext.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __DOUBLE_PINYIN_CONTEXT_H_
-#define __DOUBLE_PINYIN_CONTEXT_H_
+#ifndef __PYZY_DOUBLE_PINYIN_CONTEXT_H_
+#define __PYZY_DOUBLE_PINYIN_CONTEXT_H_
 
 #include "PyZyPinyinContext.h"
 
@@ -62,4 +62,4 @@ private:
 
 };  // namespace PyZy
 
-#endif  // __DOUBLE_PINYIN_CONTEXT_H_
+#endif  // __PYZY_DOUBLE_PINYIN_CONTEXT_H_
diff --git a/src/PyZyDoublePinyinTable.h b/src/PyZyDoublePinyinTable.h
index 2488265..28ec0ef 100644
--- a/src/PyZyDoublePinyinTable.h
+++ b/src/PyZyDoublePinyinTable.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __DOUBLE_PINYIN_TABLE_H_
-#define __DOUBLE_PINYIN_TABLE_H_
+#ifndef __PYZY_DOUBLE_PINYIN_TABLE_H_
+#define __PYZY_DOUBLE_PINYIN_TABLE_H_
 
 #define DOUBLE_PINYIN_MSPY  (0)
 #define DOUBLE_PINYIN_ZRM   (1)
@@ -396,4 +396,4 @@ static const struct {
 };
 #endif  // DEFINE_DOUBLE_PINYIN_TABLE
 
-#endif  // __DOUBLE_PINYIN_TABLE_H_
+#endif  // __PYZY_DOUBLE_PINYIN_TABLE_H_
diff --git a/src/PyZyDynamicSpecialPhrase.h b/src/PyZyDynamicSpecialPhrase.h
index 43fd4bc..2d04f26 100644
--- a/src/PyZyDynamicSpecialPhrase.h
+++ b/src/PyZyDynamicSpecialPhrase.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __DYNAMIC_SPECIAL_PHRASE_H_
-#define __DYNAMIC_SPECIAL_PHRASE_H_
+#ifndef __PYZY_DYNAMIC_SPECIAL_PHRASE_H_
+#define __PYZY_DYNAMIC_SPECIAL_PHRASE_H_
 
 #include <ctime>
 #include <string>
@@ -54,5 +54,5 @@ private:
 
 };  // namespace PyZy
 
-#endif  // __DYNAMIC_SPECIAL_PHRASE_H_
+#endif  // __PYZY_DYNAMIC_SPECIAL_PHRASE_H_
 
diff --git a/src/PyZyFullPinyinContext.h b/src/PyZyFullPinyinContext.h
index 7218cb8..c196f75 100644
--- a/src/PyZyFullPinyinContext.h
+++ b/src/PyZyFullPinyinContext.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __FULL_PINYIN_CONTEXT_H_
-#define __FULL_PINYIN_CONTEXT_H_
+#ifndef __PYZY_FULL_PINYIN_CONTEXT_H_
+#define __PYZY_FULL_PINYIN_CONTEXT_H_
 
 #include "PyZyPinyinContext.h"
 
@@ -61,4 +61,4 @@ protected:
 
 };  // namespace PyZy
 
-#endif  // 
+#endif  // __PYZY_FULL_PINYIN_CONTEXT_H_
diff --git a/src/PyZyInputContext.h b/src/PyZyInputContext.h
index 292eac3..557b5df 100644
--- a/src/PyZyInputContext.h
+++ b/src/PyZyInputContext.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __INPUT_CONTEXT_H_
-#define __INPUT_CONTEXT_H_
+#ifndef __PYZY_INPUT_CONTEXT_H_
+#define __PYZY_INPUT_CONTEXT_H_
 
 #include <string>
 #include <vector>
@@ -119,4 +119,4 @@ public:
 
 }; // namespace PyZy
 
-#endif  // __INPUT_CONTEXT_H_
+#endif  // __PYZY_INPUT_CONTEXT_H_
diff --git a/src/PyZyPhoneticContext.h b/src/PyZyPhoneticContext.h
index 08c0291..4229736 100644
--- a/src/PyZyPhoneticContext.h
+++ b/src/PyZyPhoneticContext.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __PHONETIC_CONTEXT_H_
-#define __PHONETIC_CONTEXT_H_
+#ifndef __PYZY_PHONETIC_CONTEXT_H_
+#define __PYZY_PHONETIC_CONTEXT_H_
 
 #include <string>
 #include <vector>
@@ -141,4 +141,4 @@ protected:
 
 }; // namespace PyZy
 
-#endif  // __PHONETIC_CONTEXT_H_
+#endif  // __PYZY_PHONETIC_CONTEXT_H_
diff --git a/src/PyZyPhrase.h b/src/PyZyPhrase.h
index 0659379..8355e31 100644
--- a/src/PyZyPhrase.h
+++ b/src/PyZyPhrase.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __PHRASE_H_
-#define __PHRASE_H_
+#ifndef __PYZY_PHRASE_H_
+#define __PYZY_PHRASE_H_
 
 #include <cstring>
 #include "PyZyTypes.h"
@@ -70,4 +70,4 @@ struct Phrase {
 
 };  // namespace PyZy
 
-#endif  // __PHRASE_H_
+#endif  // __PYZY_PHRASE_H_
diff --git a/src/PyZyPhraseArray.h b/src/PyZyPhraseArray.h
index bbfefa6..3c98179 100644
--- a/src/PyZyPhraseArray.h
+++ b/src/PyZyPhraseArray.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __PHRASE_ARRAY_H_
-#define __PHRASE_ARRAY_H_
+#ifndef __PYZY_PHRASE_ARRAY_H_
+#define __PYZY_PHRASE_ARRAY_H_
 
 #include <vector>
 #include "PyZyPhrase.h"
@@ -31,4 +31,4 @@ typedef std::vector<Phrase> PhraseArray;
 
 };  // namespace PyZy
 
-#endif  // __PHRASE_ARRAY_H_
+#endif  // __PYZY_PHRASE_ARRAY_H_
diff --git a/src/PyZyPhraseEditor.h b/src/PyZyPhraseEditor.h
index ff2384a..d59e068 100644
--- a/src/PyZyPhraseEditor.h
+++ b/src/PyZyPhraseEditor.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __PHRASE_EDITOR_H_
-#define __PHRASE_EDITOR_H_
+#ifndef __PYZY_PHRASE_EDITOR_H_
+#define __PYZY_PHRASE_EDITOR_H_
 
 #include "PyZyUtil.h"
 #include "PyZyString.h"
@@ -130,4 +130,4 @@ private:
 
 };  // namespace PyZy
 
-#endif  // __PHRASE_EDITOR_H_
+#endif  // __PYZY_PHRASE_EDITOR_H_
diff --git a/src/PyZyPinyinArray.h b/src/PyZyPinyinArray.h
index 7e30d57..c69ac8e 100644
--- a/src/PyZyPinyinArray.h
+++ b/src/PyZyPinyinArray.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __PINYIN_ARRAY_H_
-#define __PINYIN_ARRAY_H_
+#ifndef __PYZY_PINYIN_ARRAY_H_
+#define __PYZY_PINYIN_ARRAY_H_
 
 #include <vector>
 #include "PyZyTypes.h"
@@ -71,4 +71,4 @@ public:
 
 };  // namespace PyZy
 
-#endif  // __PINYIN_ARRAY_H_
+#endif  // __PYZY_PINYIN_ARRAY_H_
diff --git a/src/PyZyPinyinContext.h b/src/PyZyPinyinContext.h
index ce4aacc..35ba7df 100644
--- a/src/PyZyPinyinContext.h
+++ b/src/PyZyPinyinContext.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __PINYIN_CONTEXT_H_
-#define __PINYIN_CONTEXT_H_
+#ifndef __PYZY_PINYIN_CONTEXT_H_
+#define __PYZY_PINYIN_CONTEXT_H_
 
 #include "PyZyPhoneticContext.h"
 
@@ -40,4 +40,4 @@ protected:
 
 }; // namespace PyZy
 
-#endif  // __PINYIN_CONTEXT_H_
+#endif  // __PYZY_PINYIN_CONTEXT_H_
diff --git a/src/PyZyPinyinParser.h b/src/PyZyPinyinParser.h
index ba8c62c..31054f7 100644
--- a/src/PyZyPinyinParser.h
+++ b/src/PyZyPinyinParser.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __PINYIN_PARSER_H_
-#define __PINYIN_PARSER_H_
+#ifndef __PYZY_PINYIN_PARSER_H_
+#define __PYZY_PINYIN_PARSER_H_
 
 #include <glib.h>
 #include "PyZyString.h"
@@ -47,4 +47,4 @@ public:
 
 };  // namespace PyZy
 
-#endif  // __PINYIN_PARSER_H_
+#endif  // __PYZY_PINYIN_PARSER_H_
diff --git a/src/PyZySimpTradConverter.h b/src/PyZySimpTradConverter.h
index c673ce3..fec8083 100644
--- a/src/PyZySimpTradConverter.h
+++ b/src/PyZySimpTradConverter.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __SIMP_TRAD_CONVERTER_H_
-#define __SIMP_TRAD_CONVERTER_H_
+#ifndef __PYZY_SIMP_TRAD_CONVERTER_H_
+#define __PYZY_SIMP_TRAD_CONVERTER_H_
 
 #include <glib.h>
 
@@ -35,4 +35,4 @@ public:
 
 };  // namespace PyZy
 
-#endif  // __SIMP_TRAD_CONVERTER_H_
+#endif  // __PYZY_SIMP_TRAD_CONVERTER_H_
diff --git a/src/PyZySpecialPhrase.h b/src/PyZySpecialPhrase.h
index 64f594a..371baca 100644
--- a/src/PyZySpecialPhrase.h
+++ b/src/PyZySpecialPhrase.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __SPECIAL_PHRASE_H_
-#define __SPECIAL_PHRASE_H_
+#ifndef __PYZY_SPECIAL_PHRASE_H_
+#define __PYZY_SPECIAL_PHRASE_H_
 
 #include <string>
 #include <glib.h>
@@ -45,4 +45,4 @@ private:
 
 };  // namespace PyZy
 
-#endif  // __SPECIAL_PHRASE_H_
+#endif  // __PYZY_SPECIAL_PHRASE_H_
diff --git a/src/PyZySpecialPhraseTable.h b/src/PyZySpecialPhraseTable.h
index 33edbb3..f28cfd3 100644
--- a/src/PyZySpecialPhraseTable.h
+++ b/src/PyZySpecialPhraseTable.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __SPECIAL_PHRASE_TABLE_H_
-#define __SPECIAL_PHRASE_TABLE_H_
+#ifndef __PYZY_SPECIAL_PHRASE_TABLE_H_
+#define __PYZY_SPECIAL_PHRASE_TABLE_H_
 
 #include <map>
 #include <string>
@@ -56,4 +56,4 @@ private:
 
 };  // namespace PyZy
 
-#endif  // __SPECIAL_PHRASE_TABLE_H_
+#endif  // __PYZY_SPECIAL_PHRASE_TABLE_H_
diff --git a/src/PyZyString.h b/src/PyZyString.h
index bff7c0e..aba26ae 100644
--- a/src/PyZyString.h
+++ b/src/PyZyString.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __STRING_H_
-#define __STRING_H_
+#ifndef __PYZY_STRING_H_
+#define __PYZY_STRING_H_
 
 #include <glib.h>
 #include <stdarg.h>
@@ -181,4 +181,4 @@ public:
 
 };  // namespace PyZy
 
-#endif  // __STRING_H_
+#endif  // __PYZY_STRING_H_
diff --git a/src/PyZyTypes.h b/src/PyZyTypes.h
index 8a3722e..b8929af 100644
--- a/src/PyZyTypes.h
+++ b/src/PyZyTypes.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __TYPES_H_
-#define __TYPES_H_
+#ifndef __PYZY_TYPES_H_
+#define __PYZY_TYPES_H_
 
 #include <glib.h>
 
@@ -144,4 +144,4 @@ struct Pinyin {
 
 };  // namespace PyZy
 
-#endif  // __TYPES_H_
+#endif  // __PYZY_TYPES_H_
diff --git a/src/PyZyUtil.h b/src/PyZyUtil.h
index 52e0e7e..5995e52 100644
--- a/src/PyZyUtil.h
+++ b/src/PyZyUtil.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#ifndef __UTIL_H_
-#define __UTIL_H_
+#ifndef __PYZY_UTIL_H_
+#define __PYZY_UTIL_H_
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -37,7 +37,7 @@
 #include <string>
 #include <glib/gtypes.h>
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#ifdef __GXX_EXPERIMENTAL_CXX0X__PYZY_
 #  include <memory>
 #else
 #  include <boost/shared_ptr.hpp>
@@ -51,7 +51,7 @@ namespace std {
     //      but scoped_ptr cannot.
     template<typename T> class unique_ptr : public boost::scoped_ptr<T> {};
 };
-#endif  // __GXX_EXPERIMENTAL_CXX0X__
+#endif  // __GXX_EXPERIMENTAL_CXX0X__PYZY_
 
 namespace PyZy {
 
@@ -118,4 +118,4 @@ public:
 
 };  // namespace PyZy
 
-#endif  // __UTIL_H_
+#endif  // __PYZY_UTIL_H_