rename macros

libpinyin · May 27, 2015 · 59fe216 · 59fe216
1 parent 64b5d65
commit 59fe216
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/pinyin.cpp b/src/pinyin.cpp
@@ -424,7 +424,7 @@ pinyin_context_t * pinyin_init(const char * systemdir, const char * userdir){
     /* load addon system chewing table. */
     chunk = new MemoryChunk;
     filename = g_build_filename
-        (context->m_system_dir, ADDON_PINYIN_INDEX, NULL);
+        (context->m_system_dir, ADDON_SYSTEM_PINYIN_INDEX, NULL);
 
 #ifdef LIBPINYIN_USE_MMAP
     if (!chunk->mmap(filename)) {
@@ -448,7 +448,7 @@ pinyin_context_t * pinyin_init(const char * systemdir, const char * userdir){
     /* load addon system phrase table */
     chunk = new MemoryChunk;
     filename = g_build_filename
-        (context->m_system_dir, ADDON_PHRASE_INDEX, NULL);
+        (context->m_system_dir, ADDON_SYSTEM_PHRASE_INDEX, NULL);
 
 #ifdef LIBPINYIN_USE_MMAP
     if (!chunk->mmap(filename)) {

diff --git a/src/pinyin_internal.h b/src/pinyin_internal.h
@@ -58,8 +58,8 @@
 #define USER_PINYIN_INDEX "user_pinyin_index.bin"
 #define SYSTEM_PHRASE_INDEX "phrase_index.bin"
 #define USER_PHRASE_INDEX "user_phrase_index.bin"
-#define ADDON_PINYIN_INDEX "addon_pinyin_index.bin"
-#define ADDON_PHRASE_INDEX "addon_phrase_index.bin"
+#define ADDON_SYSTEM_PINYIN_INDEX "addon_pinyin_index.bin"
+#define ADDON_SYSTEM_PHRASE_INDEX "addon_phrase_index.bin"
 
 
 using namespace pinyin;

diff --git a/utils/storage/gen_binary_files.cpp b/utils/storage/gen_binary_files.cpp
@@ -123,8 +123,8 @@ int main(int argc, char * argv[]){
 
     phrase_files = system_table_info.get_addon_tables();
 
-    generate_binary_files(ADDON_PINYIN_INDEX,
-                          ADDON_PHRASE_INDEX,
+    generate_binary_files(ADDON_SYSTEM_PINYIN_INDEX,
+                          ADDON_SYSTEM_PHRASE_INDEX,
                           phrase_files);
 
     return 0;