From 59fe2160a265ebecce051645bba78b1fe3ddf8eb Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 27 May 2015 17:35:25 +0800 Subject: rename macros --- src/pinyin.cpp | 4 ++-- src/pinyin_internal.h | 4 ++-- utils/storage/gen_binary_files.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pinyin.cpp b/src/pinyin.cpp index c353c1f..34169fb 100644 --- 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 index 7b8b245..72fb04f 100644 --- 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 index 4bee0d8..3937a68 100644 --- 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; -- cgit