From 2cc2dadc6bf0149f1a0ed386880e3fb4262e3b67 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 22 Mar 2013 11:06:55 +0800 Subject: use G_BEGIN/END_DECLS --- src/pinyin.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/pinyin.h') diff --git a/src/pinyin.h b/src/pinyin.h index 3a9a16e..6002315 100644 --- a/src/pinyin.h +++ b/src/pinyin.h @@ -27,24 +27,10 @@ #include "novel_types.h" #include "pinyin_custom2.h" -namespace pinyin{ +G_BEGIN_DECLS + typedef struct _ChewingKey ChewingKey; typedef struct _ChewingKeyRest ChewingKeyRest; -}; - -using pinyin::pinyin_option_t; -using pinyin::DoublePinyinScheme; -using pinyin::ChewingScheme; - -using pinyin::phrase_token_t; -using pinyin::null_token; - -using pinyin::ChewingKey; -using pinyin::ChewingKeyRest; -using pinyin::ChewingKeyVector; - - -extern "C" { typedef struct _pinyin_context_t pinyin_context_t; typedef struct _pinyin_instance_t pinyin_instance_t; @@ -614,6 +600,6 @@ typedef ChewingKeyRest PinyinKeyPos; #define LIBPINYIN_FORMAT_VERSION "0.8.92" -}; +G_END_DECLS #endif -- cgit