Kouhei Sutou
null+****@clear*****
Thu May 9 16:44:15 JST 2013
Kouhei Sutou 2013-05-09 16:44:15 +0900 (Thu, 09 May 2013) New Revision: a12f3b101334bc2daf1701d56097bd1269780138 https://github.com/groonga/groonga/commit/a12f3b101334bc2daf1701d56097bd1269780138 Message: Add "GRN_" prefix to WITH_XXX values It is for avoiding name conflict when groonga is bundled in mroonga in MariaDB. Modified files: config.h.cmake configure.ac groonga-httpd-conf.sh.in lib/ctx.c lib/ctx_impl.h lib/db.c lib/mrb.c lib/nfkc.c lib/nfkc.rb lib/normalizer.c lib/output.c lib/proc.c lib/store.c lib/str.c src/groonga.c test/unit/core/test-context.c test/unit/core/test-object.c Modified: config.h.cmake (+10 -10) =================================================================== --- config.h.cmake 2013-05-09 16:22:26 +0900 (147e274) +++ config.h.cmake 2013-05-09 16:44:15 +0900 (265be15) @@ -70,16 +70,16 @@ #cmakedefine WORDS_BIGENDIAN /* packages */ -#cmakedefine WITH_BENCHMARK -#cmakedefine WITH_CUTTER -#cmakedefine WITH_KYTEA -#cmakedefine WITH_LIBMEMCACHED -#cmakedefine WITH_LZO -#cmakedefine WITH_MECAB -#cmakedefine WITH_MESSAGE_PACK -#cmakedefine WITH_NFKC -#cmakedefine WITH_ZEROMQ -#cmakedefine WITH_ZLIB +#cmakedefine GRN_WITH_BENCHMARK +#cmakedefine GRN_WITH_CUTTER +#cmakedefine GRN_WITH_KYTEA +#cmakedefine GRN_WITH_LIBMEMCACHED +#cmakedefine GRN_WITH_LZO +#cmakedefine GRN_WITH_MECAB +#cmakedefine GRN_WITH_MESSAGE_PACK +#cmakedefine GRN_WITH_NFKC +#cmakedefine GRN_WITH_ZEROMQ +#cmakedefine GRN_WITH_ZLIB /* headers */ #cmakedefine HAVE_DLFCN_H Modified: configure.ac (+25 -23) =================================================================== --- configure.ac 2013-05-09 16:22:26 +0900 (0a836e1) +++ configure.ac 2013-05-09 16:44:15 +0900 (fcc1623) @@ -464,7 +464,7 @@ AC_ARG_ENABLE(nfkc, [use nfkc based utf8 normalization. [default=yes]])],, [enable_nfkc="yes"]) if test "x$enable_nfkc" = "xyes"; then - AC_DEFINE(WITH_NFKC, [1], [compile with nfkc.c]) + AC_DEFINE(GRN_WITH_NFKC, [1], [compile with nfkc.c]) fi # coverage @@ -679,7 +679,7 @@ m4_ifdef([AC_CHECK_CPPCUTTER], AM_CONDITIONAL([WITH_CUTTER], [test "$cutter_use_cutter" = "yes"]) AM_CONDITIONAL([WITH_CPPCUTTER], [test "$cutter_use_cppcutter" = "yes"]) if test "$cutter_use_cutter" = "yes"; then - AC_DEFINE(WITH_CUTTER, 1, [Define to 1 if you use Cutter]) + AC_DEFINE(GRN_WITH_CUTTER, 1, [Define to 1 if you use Cutter]) ac_cv_have_libmemcached=no AC_CHECK_HEADER(libmemcached/memcached.h, @@ -688,7 +688,7 @@ if test "$cutter_use_cutter" = "yes"; then AM_CONDITIONAL([WITH_LIBMEMCACHED], [test "$ac_cv_have_libmemcached" = "yes"]) if test "$ac_cv_have_libmemcached" = "yes"; then - AC_DEFINE(WITH_LIBMEMCACHED, 1, [Define to 1 if you use libmemcached]) + AC_DEFINE(GRN_WITH_LIBMEMCACHED, 1, [Define to 1 if you use libmemcached]) fi else AM_CONDITIONAL([WITH_LIBMEMCACHED], false) @@ -713,7 +713,7 @@ else AC_MSG_RESULT($ac_benchmark_available) fi if test "$benchmark_available" = "yes"; then - AC_DEFINE(WITH_BENCHMARK, 1, [Define to 1 if benchamrk is available]) + AC_DEFINE(GRN_WITH_BENCHMARK, 1, [Define to 1 if benchamrk is available]) fi AM_CONDITIONAL([WITH_BENCHMARK], [test "$benchmark_available" = "yes"]) @@ -816,7 +816,7 @@ if test "x$enable_libedit" != "xno"; then ], [libedit_available=no]) if test "x$libedit_available" = "xyes"; then - AC_DEFINE(WITH_LIBEDIT, [1], [Use libedit with multibyte support.]) + AC_DEFINE(GRN_WITH_LIBEDIT, [1], [Use libedit with multibyte support.]) else if test "x$enable_editline" = "xyes"; then AC_MSG_ERROR("No libedit found") @@ -830,14 +830,15 @@ AC_ARG_WITH(zlib, [use zlib for data compression. [default=no]])], [with_zlib="$withval"], [with_zlib="no"]) -WITH_ZLIB=no +GRN_WITH_ZLIB=no if test "x$with_zlib" = "xyes"; then - AC_DEFINE(WITH_ZLIB, [1], [with zlib]) - AC_SEARCH_LIBS(compress, z, [WITH_ZLIB=yes], [AC_MSG_ERROR("No libz found")]) + AC_DEFINE(GRN_WITH_ZLIB, [1], [with zlib]) + AC_SEARCH_LIBS(compress, z, [GRN_WITH_ZLIB=yes], + [AC_MSG_ERROR("No libz found")]) else - AC_SEARCH_LIBS(compress, z, [WITH_ZLIB=yes], []) + AC_SEARCH_LIBS(compress, z, [GRN_WITH_ZLIB=yes], []) fi -AC_SUBST(WITH_ZLIB) +AC_SUBST(GRN_WITH_ZLIB) # LZO AC_ARG_WITH(lzo, @@ -846,7 +847,7 @@ AC_ARG_WITH(lzo, [with_lzo="$withval"], [with_lzo="no"]) if test "x$with_lzo" = "xyes"; then - AC_DEFINE(WITH_LZO, [1], [with lzo]) + AC_DEFINE(GRN_WITH_LZO, [1], [with lzo]) AC_SEARCH_LIBS(lzo1_compress, lzo2, [], [AC_MSG_ERROR("No liblzo2 found")]) fi @@ -901,7 +902,7 @@ if test "x$with_mecab" = "xyes"; then fi fi if test "x$with_mecab" = "xyes"; then - AC_DEFINE(WITH_MECAB, [1], [use MeCab]) + AC_DEFINE(GRN_WITH_MECAB, [1], [use MeCab]) fi AM_CONDITIONAL(WITH_MECAB, test "x$with_mecab" = "xyes") @@ -928,7 +929,7 @@ if test "x$with_kytea" != "xno"; then with_kytea="$kytea_exists" fi if test "x$with_kytea" = "xyes"; then - AC_DEFINE(WITH_KYTEA, [1], [use KyTea]) + AC_DEFINE(GRN_WITH_KYTEA, [1], [use KyTea]) fi AM_CONDITIONAL(WITH_KYTEA, test "x$with_kytea" = "xyes") @@ -963,7 +964,7 @@ if test "x$enable_zeromq" != "xno"; then ], [zeromq_available=no]) if test "x$zeromq_available" = "xyes"; then - AC_DEFINE(WITH_ZEROMQ, [1], [Define to 1 if ZeroMQ is available.]) + AC_DEFINE(GRN_WITH_ZEROMQ, [1], [Define to 1 if ZeroMQ is available.]) else if test "x$enable_zeromq" = "xyes"; then AC_MSG_ERROR("No ZeroMQ found") @@ -1009,7 +1010,7 @@ if test "x$with_libevent" != "xno"; then LDFLAGS="$_SAVE_LDFLAGS" LIBS="$_SAVE_LIBS" if test "$libevent_available" = "yes"; then - AC_DEFINE(WITH_LIBEVENT, [1], [Define to 1 if libevent is available.]) + AC_DEFINE(GRN_WITH_LIBEVENT, [1], [Define to 1 if libevent is available.]) LIBEVENT_CFLAGS="$libevent_cflags" LIBEVENT_LIBS="$libevent_ldflags" else @@ -1040,7 +1041,8 @@ if test "x$with_message_pack" != "xno"; then LDFLAGS="$_SAVE_LDFLAGS" LIBS="$_SAVE_LIBS" if test "x$message_pack_available" = "xyes"; then - AC_DEFINE(WITH_MESSAGE_PACK, [1], [Define to 1 if MessagePack is available.]) + AC_DEFINE(GRN_WITH_MESSAGE_PACK, [1], + [Define to 1 if MessagePack is available.]) MESSAGE_PACK_CFLAGS="-I$with_message_pack/include" MESSAGE_PACK_LIBS="-L$with_message_pack/lib -lmsgpack" else @@ -1273,7 +1275,7 @@ MRUBY_VERSION=mruby_version AC_SUBST(MRUBY_VERSION) if test "$enable_mruby" = "yes"; then - AC_DEFINE(WITH_MRUBY, [1], [Define to 1 if mruby is enabled.]) + AC_DEFINE(GRN_WITH_MRUBY, [1], [Define to 1 if mruby is enabled.]) MRUBY_CFLAGS="-I\$(top_srcdir)/vendor/mruby-${MRUBY_VERSION}/include" MRUBY_LIBS="\$(top_builddir)/vendor/mruby/libmruby.la" else @@ -1285,7 +1287,7 @@ AC_SUBST(MRUBY_LIBS) AM_CONDITIONAL(WITH_MRUBY, test "$enable_mruby" = "yes") # PCRE -WITH_PCRE=no +GRN_WITH_PCRE=no AC_ARG_WITH(pcre, [AS_HELP_STRING([--without-pcre], [use PCRE for groonga-httpd. [default=auto-detect]])], @@ -1296,15 +1298,15 @@ if test "x$with_pcre" != "xno"; then PKG_CHECK_MODULES([PCRE], [libpcre], [_PKG_CONFIG(PCRE_LIBS_ONLY_L, [libs-only-L], [libpcre]) PCRE_LIBS_ONLY_L="$pkg_cv_PCRE_LIBS_ONLY_L" - WITH_PCRE=yes], - [WITH_PCRE=no]) + GRN_WITH_PCRE=yes], + [GRN_WITH_PCRE=no]) ], - [WITH_PCRE=no]) - if test "x$with_pcre" = "xyes" -a "$WITH_PCRE" != "yes"; then + [GRN_WITH_PCRE=no]) + if test "x$with_pcre" = "xyes" -a "$GRN_WITH_PCRE" != "yes"; then AC_MSG_ERROR("No PCRE found") fi fi -AC_SUBST(WITH_PCRE) +AC_SUBST(GRN_WITH_PCRE) AC_SUBST(PCRE_CFLAGS) AC_SUBST(PCRE_LIBS_ONLY_L) Modified: groonga-httpd-conf.sh.in (+2 -2) =================================================================== --- groonga-httpd-conf.sh.in 2013-05-09 16:22:26 +0900 (3e1b82c) +++ groonga-httpd-conf.sh.in 2013-05-09 16:44:15 +0900 (c509bb5) @@ -18,7 +18,7 @@ export GROONGA_HTTPD_ERROR_LOG_PATH="${localstatedir}/log/groonga/httpd/error.lo export GROONGA_HTTPD_HTTP_LOG_PATH="${localstatedir}/log/groonga/httpd/access.log" export GROONGA_HTTPD_PID_PATH="${localstatedir}/run/groonga/groonga-httpd.pid" export GROONGA_HTTPD_DEBUG="@grn_debug@" -export GROONGA_HTTPD_WITH_PCRE="@WITH_PCRE@" +export GROONGA_HTTPD_WITH_PCRE="@GRN_WITH_PCRE@" export GROONGA_HTTPD_PCRE_CFLAGS="@PCRE_CFLAGS@" export GROONGA_HTTPD_PCRE_LIBS_ONLY_L="@PCRE_LIBS_ONLY_L@" -export GROONGA_HTTPD_WITH_ZLIB="@WITH_ZLIB@" +export GROONGA_HTTPD_WITH_ZLIB="@GRN_WITH_ZLIB@" Modified: lib/ctx.c (+3 -3) =================================================================== --- lib/ctx.c 2013-05-09 16:22:26 +0900 (c6dc237) +++ lib/ctx.c 2013-05-09 16:44:15 +0900 (559964d) @@ -417,7 +417,7 @@ grn_ctx_loader_clear(grn_ctx *ctx) #define IMPL_SIZE ((sizeof(struct _grn_ctx_impl) + (grn_pagesize - 1)) & ~(grn_pagesize - 1)) -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK static inline int grn_msgpack_buffer_write(void *data, const char *buf, unsigned int len) { @@ -505,7 +505,7 @@ grn_ctx_impl_init(grn_ctx *ctx) grn_loader_init(&ctx->impl->loader); ctx->impl->plugin_path = NULL; -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_packer_init(&ctx->impl->msgpacker, ctx, grn_msgpack_buffer_write); #endif @@ -1497,7 +1497,7 @@ get_content_mime_type(grn_ctx *ctx, const char *p, const char *pe) ctx->impl->mime_type = "image/jpeg"; } break; -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK case 'm' : if (p + 7 == pe && !memcmp(p, "msgpack", 7)) { ctx->impl->output_type = GRN_CONTENT_MSGPACK; Modified: lib/ctx_impl.h (+4 -4) =================================================================== --- lib/ctx_impl.h 2013-05-09 16:22:26 +0900 (e63ac38) +++ lib/ctx_impl.h 2013-05-09 16:44:15 +0900 (56454d2) @@ -26,11 +26,11 @@ #include "com.h" #endif /* GRN_COM_H */ -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK #include <msgpack.h> #endif -#ifdef WITH_MRUBY +#ifdef GRN_WITH_MRUBY # include <mruby.h> #endif @@ -169,10 +169,10 @@ struct _grn_ctx_impl { uint64_t u64; } data; -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_packer msgpacker; #endif -#ifdef WITH_MRUBY +#ifdef GRN_WITH_MRUBY mrb_state *mrb; #endif }; Modified: lib/db.c (+11 -11) =================================================================== --- lib/db.c 2013-05-09 16:22:26 +0900 (8e6f97c) +++ lib/db.c 2013-05-09 16:44:15 +0900 (631cd27) @@ -253,7 +253,7 @@ grn_db_open(grn_ctx *ctx, const char *path) DB_OBJ(&s->obj)->range = GRN_ID_NIL; grn_ctx_use(ctx, (grn_obj *)s); grn_ctx_use(ctx_, (grn_obj *)s); -#ifdef WITH_MECAB +#ifdef GRN_WITH_MECAB if (grn_db_init_mecab_tokenizer(ctx)) { ERRCLR(ctx); } @@ -3406,16 +3406,16 @@ grn_column_create(grn_ctx *ctx, grn_obj *table, if (ja_p) { grn_bool zlib_p = GRN_FALSE; grn_bool lzo_p = GRN_FALSE; -#ifdef WITH_ZLIB +#ifdef GRN_WITH_ZLIB if (flags & GRN_OBJ_COMPRESS_ZLIB) { zlib_p = GRN_TRUE; } -#endif /* WITH_ZLIB */ -#ifdef WITH_LZO +#endif /* GRN_WITH_ZLIB */ +#ifdef GRN_WITH_LZO if (flags & GRN_OBJ_COMPRESS_LZO) { lzo_p = GRN_TRUE; } -#endif /* WITH_LZO */ +#endif /* GRN_WITH_LZO */ if (zlib_p || lzo_p) { int table_name_len; char table_name[GRN_TABLE_MAX_KEY_SIZE]; @@ -5733,7 +5733,7 @@ grn_obj_get_info(grn_ctx *ctx, grn_obj *obj, grn_info_type type, grn_obj *valueb "failed to open value buffer for GRN_INFO_ZLIB_SUPPORT"); goto exit; } -#ifdef WITH_ZLIB +#ifdef GRN_WITH_ZLIB GRN_BOOL_PUT(ctx, valuebuf, GRN_TRUE); #else GRN_BOOL_PUT(ctx, valuebuf, GRN_FALSE); @@ -5745,11 +5745,11 @@ grn_obj_get_info(grn_ctx *ctx, grn_obj *obj, grn_info_type type, grn_obj *valueb "failed to open value buffer for GRN_INFO_LZO_SUPPORT"); goto exit; } -#ifdef WITH_LZO +#ifdef GRN_WITH_LZO GRN_BOOL_PUT(ctx, valuebuf, GRN_TRUE); -#else /* WITH_LZO */ +#else /* GRN_WITH_LZO */ GRN_BOOL_PUT(ctx, valuebuf, GRN_FALSE); -#endif /* WITH_LZO */ +#endif /* GRN_WITH_LZO */ break; default : if (!obj) { @@ -8226,12 +8226,12 @@ grn_db_init_builtin_types(grn_ctx *ctx) grn_itoh(id, buf + 3, 2); grn_obj_register(ctx, db, buf, 5); } -#ifdef WITH_MECAB +#ifdef GRN_WITH_MECAB if (grn_db_init_mecab_tokenizer(ctx)) { ERRCLR(ctx); #endif grn_obj_register(ctx, db, "TokenMecab", 10); -#ifdef WITH_MECAB +#ifdef GRN_WITH_MECAB } #endif grn_db_init_builtin_tokenizers(ctx); Modified: lib/mrb.c (+2 -2) =================================================================== --- lib/mrb.c 2013-05-09 16:22:26 +0900 (666fcc8) +++ lib/mrb.c 2013-05-09 16:44:15 +0900 (0797b0e) @@ -19,12 +19,12 @@ #include "mrb.h" #include "ctx_impl.h" -#ifdef WITH_MRUBY +#ifdef GRN_WITH_MRUBY # include <mruby/proc.h> # include <mruby/compile.h> #endif -#ifdef WITH_MRUBY +#ifdef GRN_WITH_MRUBY void grn_ctx_impl_mrb_init(grn_ctx *ctx) { Modified: lib/nfkc.c (+2 -2) =================================================================== --- lib/nfkc.c 2013-05-09 16:22:26 +0900 (de24bdc) +++ lib/nfkc.c 2013-05-09 16:44:15 +0900 (3e6eca0) @@ -23,7 +23,7 @@ don't edit this file by hand. it generated automatically by nfkc.rb #include <groonga/nfkc.h> -#ifdef WITH_NFKC +#ifdef GRN_WITH_NFKC grn_char_type grn_nfkc_char_type(const unsigned char *str) @@ -80245,5 +80245,5 @@ case 0xE3 : return 0; } -#endif /* WITH_NFKC */ +#endif /* GRN_WITH_NFKC */ Modified: lib/nfkc.rb (+2 -2) =================================================================== --- lib/nfkc.rb 2013-05-09 16:22:26 +0900 (65e3c49) +++ lib/nfkc.rb 2013-05-09 16:44:15 +0900 (1a13438) @@ -349,7 +349,7 @@ don't edit this file by hand. it generated automatically by nfkc.rb #include "nfkc.h" -#ifdef WITH_NFKC +#ifdef GRN_WITH_NFKC unsigned char grn_nfkc_char_type(const unsigned char *str) @@ -369,7 +369,7 @@ grn_nfkc_map2(const unsigned char *prefix, const unsigned char *suffix) % return 0; } -#endif /* WITH_NFKC */ +#endif /* GRN_WITH_NFKC */ END Modified: lib/normalizer.c (+10 -10) =================================================================== --- lib/normalizer.c 2013-05-09 16:22:26 +0900 (44e96a7) +++ lib/normalizer.c 2013-05-09 16:44:15 +0900 (b970bc6) @@ -558,7 +558,7 @@ sjis_normalize(grn_ctx *ctx, grn_string *nstr) return NULL; } -#ifdef WITH_NFKC +#ifdef GRN_WITH_NFKC const char *grn_nfkc_map1(const unsigned char *str); const char *grn_nfkc_map2(const unsigned char *prefix, const unsigned char *suffix); @@ -752,7 +752,7 @@ utf8_normalize(grn_ctx *ctx, grn_string *nstr) nstr->normalized_length_in_bytes = (size_t)(d - (unsigned char *)nstr->normalized); return NULL; } -#endif /* WITH_NFKC */ +#endif /* GRN_WITH_NFKC */ inline static grn_obj * ascii_normalize(grn_ctx *ctx, grn_string *nstr) @@ -1124,11 +1124,11 @@ auto_next(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) eucjp_normalize(ctx, string); break; case GRN_ENC_UTF8 : -#ifdef WITH_NFKC +#ifdef GRN_WITH_NFKC utf8_normalize(ctx, string); -#else /* WITH_NFKC */ +#else /* GRN_WITH_NFKC */ ascii_normalize(ctx, string); -#endif /* WITH_NFKC */ +#endif /* GRN_WITH_NFKC */ break; case GRN_ENC_SJIS : sjis_normalize(ctx, string); @@ -1146,7 +1146,7 @@ auto_next(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) return NULL; } -#ifdef WITH_NFKC +#ifdef GRN_WITH_NFKC static grn_obj * nfkc51_next(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) { @@ -1154,7 +1154,7 @@ nfkc51_next(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) utf8_normalize(ctx, string); return NULL; } -#endif /* WITH_NFKC */ +#endif /* GRN_WITH_NFKC */ grn_rc grn_normalizer_normalize(grn_ctx *ctx, grn_obj *normalizer, grn_obj *string) @@ -1178,13 +1178,13 @@ grn_db_init_builtin_normalizers(grn_ctx *ctx) grn_normalizer_register(ctx, GRN_NORMALIZER_AUTO_NAME, -1, NULL, auto_next, NULL); -#ifdef WITH_NFKC +#ifdef GRN_WITH_NFKC grn_normalizer_register(ctx, normalizer_nfkc51_name, -1, NULL, nfkc51_next, NULL); -#else /* WITH_NFKC */ +#else /* GRN_WITH_NFKC */ grn_normalizer_register(ctx, normalizer_nfkc51_name, -1, NULL, NULL, NULL); -#endif /* WITH_NFKC */ +#endif /* GRN_WITH_NFKC */ /* grn_normalizer_register(ctx, "NormalizerUCA", -1, NULL, uca_next, NULL); Modified: lib/output.c (+13 -13) =================================================================== --- lib/output.c 2013-05-09 16:22:26 +0900 (d5c4a29) +++ lib/output.c 2013-05-09 16:44:15 +0900 (5b92457) @@ -80,7 +80,7 @@ grn_output_array_open(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_typ if (DEPTH > 2) { GRN_TEXT_PUTS(ctx, outbuf, "[\t"); } break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK if (nelements < 0) { GRN_LOG(ctx, GRN_LOG_DEBUG, "grn_output_array_open nelements (%d) for <%s>", @@ -147,7 +147,7 @@ grn_output_map_open(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, if (DEPTH > 2) { GRN_TEXT_PUTS(ctx, outbuf, "{\t"); } break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK if (nelements < 0) { GRN_LOG(ctx, GRN_LOG_DEBUG, "grn_output_map_open nelements (%d) for <%s>", @@ -212,7 +212,7 @@ grn_output_int32(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, in GRN_TEXT_PUTS(ctx, outbuf, "</INT>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_pack_int32(&ctx->impl->msgpacker, value); #endif break; @@ -239,7 +239,7 @@ grn_output_int64(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, in GRN_TEXT_PUTS(ctx, outbuf, "</INT>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_pack_int64(&ctx->impl->msgpacker, value); #endif break; @@ -266,7 +266,7 @@ grn_output_uint64(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, i GRN_TEXT_PUTS(ctx, outbuf, "</INT>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_pack_uint64(&ctx->impl->msgpacker, value); #endif break; @@ -293,7 +293,7 @@ grn_output_float(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, do GRN_TEXT_PUTS(ctx, outbuf, "</FLOAT>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_pack_double(&ctx->impl->msgpacker, value); #endif break; @@ -321,7 +321,7 @@ grn_output_str(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, GRN_TEXT_PUTS(ctx, outbuf, "</TEXT>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_pack_raw(&ctx->impl->msgpacker, value_len); msgpack_pack_raw_body(&ctx->impl->msgpacker, value, value_len); #endif @@ -356,7 +356,7 @@ grn_output_bool(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, grn GRN_TEXT_PUTS(ctx, outbuf, "</BOOL>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK if (value) { msgpack_pack_true(&ctx->impl->msgpacker); } else { @@ -384,7 +384,7 @@ grn_output_null(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type) GRN_TEXT_PUTS(ctx, outbuf, "<NULL/>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_pack_nil(&ctx->impl->msgpacker); #endif break; @@ -424,7 +424,7 @@ grn_output_time(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, int GRN_TEXT_PUTS(ctx, outbuf, "</DATE>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK msgpack_pack_double(&ctx->impl->msgpacker, dv); #endif break; @@ -472,7 +472,7 @@ grn_output_geo_point(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type GRN_TEXT_PUTS(ctx, outbuf, "</GEO_POINT>"); break; case GRN_CONTENT_MSGPACK : -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK if (value) { grn_obj buf; GRN_TEXT_INIT(&buf, 0); @@ -1559,7 +1559,7 @@ transform_xml(grn_ctx *ctx, grn_obj *output, grn_obj *transformed) GRN_OBJ_FIN(ctx, &columns); } -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK typedef struct { grn_ctx *ctx; grn_obj *buffer; @@ -1713,7 +1713,7 @@ grn_output_envelope(grn_ctx *ctx, } break; case GRN_CONTENT_MSGPACK: -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK { msgpack_writer_ctx head_writer_ctx; msgpack_packer header_packer; Modified: lib/proc.c (+1 -1) =================================================================== --- lib/proc.c 2013-05-09 16:22:26 +0900 (b186563) +++ lib/proc.c 2013-05-09 16:44:15 +0900 (6fcfb38) @@ -1453,7 +1453,7 @@ proc_column_list(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_da grn_hash *cols; grn_obj *col; int column_list_size = -1; -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK column_list_size = 1; /* [header, (key), (COLUMNS)] */ if ((col = grn_obj_column(ctx, table, KEY_NAME, sizeof(KEY_NAME)-1))) { column_list_size++; Modified: lib/store.c (+16 -16) =================================================================== --- lib/store.c 2013-05-09 16:22:26 +0900 (fe4e67e) +++ lib/store.c 2013-05-09 16:44:15 +0900 (19448bb) @@ -1058,7 +1058,7 @@ grn_ja_element_info(grn_ctx *ctx, grn_ja *ja, grn_id id, return GRN_SUCCESS; } -#ifdef WITH_ZLIB +#ifdef GRN_WITH_ZLIB #include <zlib.h> static void * @@ -1102,9 +1102,9 @@ grn_ja_ref_zlib(grn_ctx *ctx, grn_ja *ja, grn_id id, grn_io_win *iw, uint32_t *v } return value; } -#endif /* WITH_ZLIB */ +#endif /* GRN_WITH_ZLIB */ -#ifdef WITH_LZO +#ifdef GRN_WITH_LZO #include <lzo/lzo1x.h> static void * @@ -1140,21 +1140,21 @@ grn_ja_ref_lzo(grn_ctx *ctx, grn_ja *ja, grn_id id, grn_io_win *iw, uint32_t *va *value_len = lout_len; return value; } -#endif /* WITH_LZO */ +#endif /* GRN_WITH_LZO */ void * grn_ja_ref(grn_ctx *ctx, grn_ja *ja, grn_id id, grn_io_win *iw, uint32_t *value_len) { -#ifdef WITH_ZLIB +#ifdef GRN_WITH_ZLIB if (ja->header->flags & GRN_OBJ_COMPRESS_ZLIB) { return grn_ja_ref_zlib(ctx, ja, id, iw, value_len); } -#endif /* WITH_ZLIB */ -#ifdef WITH_LZO +#endif /* GRN_WITH_ZLIB */ +#ifdef GRN_WITH_LZO if (ja->header->flags & GRN_OBJ_COMPRESS_LZO) { return grn_ja_ref_lzo(ctx, ja, id, iw, value_len); } -#endif /* WITH_LZO */ +#endif /* GRN_WITH_LZO */ return grn_ja_ref_raw(ctx, ja, id, iw, value_len); } @@ -1188,7 +1188,7 @@ exit : return value; } -#ifdef WITH_ZLIB +#ifdef GRN_WITH_ZLIB inline static grn_rc grn_ja_put_zlib(grn_ctx *ctx, grn_ja *ja, grn_id id, void *value, uint32_t value_len, int flags, uint64_t *cas) @@ -1234,9 +1234,9 @@ grn_ja_put_zlib(grn_ctx *ctx, grn_ja *ja, grn_id id, GRN_FREE(zvalue); return rc; } -#endif /* WITH_ZLIB */ +#endif /* GRN_WITH_ZLIB */ -#ifdef WITH_LZO +#ifdef GRN_WITH_LZO inline static grn_rc grn_ja_put_lzo(grn_ctx *ctx, grn_ja *ja, grn_id id, void *value, uint32_t value_len, int flags, uint64_t *cas) @@ -1263,22 +1263,22 @@ grn_ja_put_lzo(grn_ctx *ctx, grn_ja *ja, grn_id id, GRN_FREE(lvalue); return rc; } -#endif /* WITH_LZO */ +#endif /* GRN_WITH_LZO */ grn_rc grn_ja_put(grn_ctx *ctx, grn_ja *ja, grn_id id, void *value, uint32_t value_len, int flags, uint64_t *cas) { -#ifdef WITH_ZLIB +#ifdef GRN_WITH_ZLIB if (ja->header->flags & GRN_OBJ_COMPRESS_ZLIB) { return grn_ja_put_zlib(ctx, ja, id, value, value_len, flags, cas); } -#endif /* WITH_ZLIB */ -#ifdef WITH_LZO +#endif /* GRN_WITH_ZLIB */ +#ifdef GRN_WITH_LZO if (ja->header->flags & GRN_OBJ_COMPRESS_LZO) { return grn_ja_put_lzo(ctx, ja, id, value, value_len, flags, cas); } -#endif /* WITH_LZO */ +#endif /* GRN_WITH_LZO */ return grn_ja_put_raw(ctx, ja, id, value, value_len, flags, cas); } Modified: lib/str.c (+5 -5) =================================================================== --- lib/str.c 2013-05-09 16:22:26 +0900 (b8e4784) +++ lib/str.c 2013-05-09 16:44:15 +0900 (b14a77a) @@ -426,7 +426,7 @@ normalize_euc(grn_ctx *ctx, grn_str *nstr) return GRN_SUCCESS; } -#ifdef WITH_NFKC +#ifdef GRN_WITH_NFKC const char *grn_nfkc_map1(const unsigned char *str); const char *grn_nfkc_map2(const unsigned char *prefix, const unsigned char *suffix); @@ -549,7 +549,7 @@ normalize_utf8(grn_ctx *ctx, grn_str *nstr) nstr->norm_blen = (size_t)(d - (unsigned char *)nstr->norm); return GRN_SUCCESS; } -#endif /* WITH_NFKC */ +#endif /* GRN_WITH_NFKC */ inline static grn_rc normalize_sjis(grn_ctx *ctx, grn_str *nstr) @@ -1235,11 +1235,11 @@ grn_str_open_(grn_ctx *ctx, const char *str, unsigned int str_len, int flags, gr rc = normalize_euc(ctx, nstr); break; case GRN_ENC_UTF8 : -#ifdef WITH_NFKC +#ifdef GRN_WITH_NFKC rc = normalize_utf8(ctx, nstr); -#else /* WITH_NFKC */ +#else /* GRN_WITH_NFKC */ rc = normalize_none(ctx, nstr); -#endif /* WITH_NFKC */ +#endif /* GRN_WITH_NFKC */ break; case GRN_ENC_SJIS : rc = normalize_sjis(ctx, nstr); Modified: src/groonga.c (+7 -7) =================================================================== --- src/groonga.c 2013-05-09 16:22:26 +0900 (549d34c) +++ src/groonga.c 2013-05-09 16:44:15 +0900 (5c9dacb) @@ -103,7 +103,7 @@ grn_rc_to_exit_code(grn_rc rc) } } -#ifdef WITH_LIBEDIT +#ifdef GRN_WITH_LIBEDIT #include <locale.h> #include <histedit.h> static EditLine *line_editor = NULL; @@ -192,7 +192,7 @@ line_editor_fgets(grn_ctx *ctx, grn_obj *buf) } return rc; } -#endif /* WITH_LIBEDIT */ +#endif /* GRN_WITH_LIBEDIT */ inline static grn_rc read_next_line(grn_ctx *ctx, grn_obj *buf) @@ -200,7 +200,7 @@ read_next_line(grn_ctx *ctx, grn_obj *buf) static int the_first_read = GRN_TRUE; grn_rc rc = GRN_SUCCESS; if (!batchmode) { -#ifdef WITH_LIBEDIT +#ifdef GRN_WITH_LIBEDIT rc = line_editor_fgets(ctx, buf); #else fprintf(stderr, "> "); @@ -1930,10 +1930,10 @@ show_version(void) #ifndef NO_NFKC printf(",nfkc"); #endif -#ifdef WITH_MECAB +#ifdef GRN_WITH_MECAB printf(",mecab"); #endif -#ifdef WITH_MESSAGE_PACK +#ifdef GRN_WITH_MESSAGE_PACK printf(",msgpack"); #endif #ifndef NO_ZLIB @@ -2415,7 +2415,7 @@ main(int argc, char **argv) cache_limit = default_cache_limit; } -#ifdef WITH_LIBEDIT +#ifdef GRN_WITH_LIBEDIT if (!batchmode) { line_editor_init(argc, argv); } @@ -2460,7 +2460,7 @@ main(int argc, char **argv) break; } -#ifdef WITH_LIBEDIT +#ifdef GRN_WITH_LIBEDIT if (!batchmode) { line_editor_fin(); } Modified: test/unit/core/test-context.c (+2 -2) =================================================================== --- test/unit/core/test-context.c 2013-05-09 16:22:26 +0900 (09402d3) +++ test/unit/core/test-context.c 2013-05-09 16:44:15 +0900 (12a2e08) @@ -134,7 +134,7 @@ test_support_zlib(void) support_p = GRN_BOOL_VALUE(&grn_support_p); GRN_OBJ_FIN(context, &grn_support_p); -#ifdef WITH_ZLIB +#ifdef GRN_WITH_ZLIB cut_assert_true(support_p); #else cut_assert_false(support_p); @@ -153,7 +153,7 @@ test_support_lzo(void) support_p = GRN_BOOL_VALUE(&grn_support_p); GRN_OBJ_FIN(context, &grn_support_p); -#ifdef WITH_LZO +#ifdef GRN_WITH_LZO cut_assert_true(support_p); #else cut_assert_false(support_p); Modified: test/unit/core/test-object.c (+1 -1) =================================================================== --- test/unit/core/test-object.c 2013-05-09 16:22:26 +0900 (eca7dca) +++ test/unit/core/test-object.c 2013-05-09 16:44:15 +0900 (bd728c3) @@ -89,7 +89,7 @@ data_is_builtin(void) NULL) ADD_DATUM(TRUE, "TokenBigram"); -#ifdef WITH_MECAB +#ifdef GRN_WITH_MECAB ADD_DATUM(TRUE, "TokenMecab"); #endif ADD_DATUM(FALSE, "Users"); -------------- next part -------------- HTML����������������������������...ダウンロード
