Kouhei Sutou
null+****@clear*****
Thu Dec 29 23:06:11 JST 2016
Kouhei Sutou 2016-12-29 23:06:11 +0900 (Thu, 29 Dec 2016) New Revision: d24cf435680837f91b547a2b6f1e80c0e615f609 https://github.com/pgroonga/pgroonga/commit/d24cf435680837f91b547a2b6f1e80c0e615f609 Message: Remove duplicated declarations Modified files: src/pgroonga.c src/pgroonga.h Modified: src/pgroonga.c (+37 -37) =================================================================== --- src/pgroonga.c 2016-12-24 00:10:36 +0900 (a804bb2) +++ src/pgroonga.c 2016-12-29 23:06:11 +0900 (3fe0c3e) @@ -148,49 +148,49 @@ static slist_head PGrnScanOpaques = SLIST_STATIC_INIT(PGrnScanOpaques); #endif #ifdef PGRN_SUPPORT_SCORE -PG_FUNCTION_INFO_V1(pgroonga_score); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_score); #endif -PG_FUNCTION_INFO_V1(pgroonga_table_name); -PG_FUNCTION_INFO_V1(pgroonga_command); - -PG_FUNCTION_INFO_V1(pgroonga_match_term_text); -PG_FUNCTION_INFO_V1(pgroonga_match_term_text_array); -PG_FUNCTION_INFO_V1(pgroonga_match_term_varchar); -PG_FUNCTION_INFO_V1(pgroonga_match_term_varchar_array); -PG_FUNCTION_INFO_V1(pgroonga_match_query_text); -PG_FUNCTION_INFO_V1(pgroonga_match_query_text_array); -PG_FUNCTION_INFO_V1(pgroonga_match_query_varchar); -PG_FUNCTION_INFO_V1(pgroonga_match_regexp_text); -PG_FUNCTION_INFO_V1(pgroonga_match_regexp_varchar); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_table_name); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_command); + +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_term_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_term_text_array); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_term_varchar); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_term_varchar_array); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_query_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_query_text_array); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_query_varchar); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_regexp_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_regexp_varchar); /* v2 */ -PG_FUNCTION_INFO_V1(pgroonga_match_text); -PG_FUNCTION_INFO_V1(pgroonga_query_text); -PG_FUNCTION_INFO_V1(pgroonga_similar_text); -PG_FUNCTION_INFO_V1(pgroonga_script_text); -PG_FUNCTION_INFO_V1(pgroonga_prefix_text); -PG_FUNCTION_INFO_V1(pgroonga_prefix_rk_text); -PG_FUNCTION_INFO_V1(pgroonga_match_contain_text); -PG_FUNCTION_INFO_V1(pgroonga_query_contain_text); -PG_FUNCTION_INFO_V1(pgroonga_prefix_contain_text_array); -PG_FUNCTION_INFO_V1(pgroonga_prefix_rk_contain_text_array); - -PG_FUNCTION_INFO_V1(pgroonga_insert); -PG_FUNCTION_INFO_V1(pgroonga_beginscan); -PG_FUNCTION_INFO_V1(pgroonga_gettuple); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_query_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_similar_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_script_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_prefix_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_prefix_rk_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_match_contain_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_query_contain_text); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_prefix_contain_text_array); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_prefix_rk_contain_text_array); + +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_insert); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_beginscan); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_gettuple); #ifdef PGRN_SUPPORT_BITMAP_INDEX -PG_FUNCTION_INFO_V1(pgroonga_getbitmap); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_getbitmap); #endif -PG_FUNCTION_INFO_V1(pgroonga_rescan); -PG_FUNCTION_INFO_V1(pgroonga_endscan); -PG_FUNCTION_INFO_V1(pgroonga_build); -PG_FUNCTION_INFO_V1(pgroonga_buildempty); -PG_FUNCTION_INFO_V1(pgroonga_bulkdelete); -PG_FUNCTION_INFO_V1(pgroonga_vacuumcleanup); -PG_FUNCTION_INFO_V1(pgroonga_canreturn); -PG_FUNCTION_INFO_V1(pgroonga_costestimate); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_rescan); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_endscan); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_build); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_buildempty); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_bulkdelete); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_vacuumcleanup); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_canreturn); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_costestimate); #ifdef PGRN_SUPPORT_CREATE_ACCESS_METHOD -PG_FUNCTION_INFO_V1(pgroonga_handler); +extern PGDLLEXPORT PG_FUNCTION_INFO_V1(pgroonga_handler); #endif static grn_ctx *ctx = NULL; Modified: src/pgroonga.h (+0 -58) =================================================================== --- src/pgroonga.h 2016-12-24 00:10:36 +0900 (478044b) +++ src/pgroonga.h 2016-12-29 23:06:11 +0900 (259fdf3) @@ -57,61 +57,3 @@ #define PGrnIndexColumnName "index" extern void PGDLLEXPORT _PG_init(void); - -extern Datum PGDLLEXPORT pgroonga_score(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_table_name(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_command(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_snippet_html(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_highlight_html(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_positions_byte(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_positions_character(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_query_extract_keywords(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_flush(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_command_escape_value(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_query_escape(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_escape_string(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_escape_boolean(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_escape_int2(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_escape_int4(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_escape_int8(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_escape_float4(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_escape_float8(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_escape_timestamptz(PG_FUNCTION_ARGS); - -extern Datum PGDLLEXPORT pgroonga_match_term_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_term_text_array(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_term_varchar(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_term_varchar_array(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_query_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_query_text_array(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_query_varchar(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_regexp_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_regexp_varchar(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_jsonb(PG_FUNCTION_ARGS); - -/* v2 */ -extern Datum PGDLLEXPORT pgroonga_match_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_query_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_similar_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_script_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_prefix_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_prefix_rk_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_match_contain_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_query_contain_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_prefix_contain_text_array(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_prefix_rk_contain_text_array(PG_FUNCTION_ARGS); - -extern Datum PGDLLEXPORT pgroonga_insert(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_beginscan(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_gettuple(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_getbitmap(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_rescan(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_endscan(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_build(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_buildempty(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_bulkdelete(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_vacuumcleanup(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_canreturn(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_costestimate(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_options(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_handler(PG_FUNCTION_ARGS); -------------- next part -------------- HTML����������������������������...Download