Kouhei Sutou
null+****@clear*****
Tue Apr 3 22:53:27 JST 2018
Kouhei Sutou 2018-04-03 22:53:27 +0900 (Tue, 03 Apr 2018) New Revision: d012215af2deb4a95dbe33f16e861bfa7891dc9e https://github.com/groonga/groonga/commit/d012215af2deb4a95dbe33f16e861bfa7891dc9e Message: Fix inverted condition Modified files: include/groonga/msgpack.h lib/grn_msgpack.h lib/msgpack.c Modified: include/groonga/msgpack.h (+2 -2) =================================================================== --- include/groonga/msgpack.h 2018-04-03 22:31:24 +0900 (b5c1727f0) +++ include/groonga/msgpack.h 2018-04-03 22:53:27 +0900 (50e7cd7ca) @@ -40,10 +40,10 @@ grn_rc grn_msgpack_pack(grn_ctx *ctx, grn_rc grn_msgpack_unpack_array(grn_ctx *ctx, msgpack_object_array *array, grn_obj *vector); -# if MSGPACK_VERSION_MAJOR < 1 +# if MSGPACK_VERSION_MAJOR >= 1 int64_t grn_msgpack_unpack_ext_time(grn_ctx *ctx, msgpack_object_ext *ext); -# endif /* MSGPACK_VERSION_MAJOR < 1 */ +# endif /* MSGPACK_VERSION_MAJOR >= 1 */ #ifdef __cplusplus } Modified: lib/grn_msgpack.h (+2 -2) =================================================================== --- lib/grn_msgpack.h 2018-04-03 22:31:24 +0900 (68e5423e2) +++ lib/grn_msgpack.h 2018-04-03 22:53:27 +0900 (b435cabc8) @@ -63,10 +63,10 @@ grn_rc grn_msgpack_pack_internal(grn_ctx *ctx, grn_rc grn_msgpack_unpack_array_internal(grn_ctx *ctx, msgpack_object_array *array, grn_obj *vector); -# if MSGPACK_VERSION_MAJOR < 1 +# if MSGPACK_VERSION_MAJOR >= 1 int64_t grn_msgpack_unpack_ext_time_internal(grn_ctx *ctx, msgpack_object_ext *ext); -# endif /* MSGPACK_VERSION_MAJOR < 1 */ +# endif /* MSGPACK_VERSION_MAJOR >= 1 */ #endif /* GRN_WITH_MESSAGE_PACK */ Modified: lib/msgpack.c (+6 -6) =================================================================== --- lib/msgpack.c 2018-04-03 22:31:24 +0900 (a1f3af7f2) +++ lib/msgpack.c 2018-04-03 22:53:27 +0900 (0701e5ae6) @@ -186,7 +186,7 @@ grn_msgpack_unpack_array_internal(grn_ctx *ctx, 0, GRN_DB_TEXT); break; -# if MSGPACK_VERSION_MAJOR < 1 +# if MSGPACK_VERSION_MAJOR >= 1 case MSGPACK_OBJECT_EXT : if (element->via.ext.type == GRN_MSGPACK_OBJECT_EXT_TIME) { grn_vector_add_element(ctx, @@ -201,7 +201,7 @@ grn_msgpack_unpack_array_internal(grn_ctx *ctx, element->via.ext.type); } break; -# endif /* MSGPACK_VERSION_MAJOR < 1 */ +# endif /* MSGPACK_VERSION_MAJOR >= 1 */ default : ERR(GRN_INVALID_ARGUMENT, "[msgpack] unexpected element type: <%#x>", @@ -213,7 +213,7 @@ grn_msgpack_unpack_array_internal(grn_ctx *ctx, return ctx->rc; } -# if MSGPACK_VERSION_MAJOR < 1 +# if MSGPACK_VERSION_MAJOR >= 1 int64_t grn_msgpack_unpack_ext_time_internal(grn_ctx *ctx, msgpack_object_ext *ext) @@ -228,7 +228,7 @@ grn_msgpack_unpack_ext_time_internal(grn_ctx *ctx, return 0; } } -# endif /* MSGPACK_VERSION_MAJOR < 1 */ +# endif /* MSGPACK_VERSION_MAJOR >= 1 */ grn_rc grn_msgpack_pack_raw(grn_ctx *ctx, @@ -262,7 +262,7 @@ grn_msgpack_unpack_array(grn_ctx *ctx, GRN_API_RETURN(ctx->rc); } -# if MSGPACK_VERSION_MAJOR < 1 +# if MSGPACK_VERSION_MAJOR >= 1 int64_t grn_msgpack_unpack_ext_time(grn_ctx *ctx, msgpack_object_ext *ext) @@ -272,5 +272,5 @@ grn_msgpack_unpack_ext_time(grn_ctx *ctx, time = grn_msgpack_unpack_ext_time_internal(ctx, ext); GRN_API_RETURN(time); } -# endif /* MSGPACK_VERSION_MAJOR < 1 */ +# endif /* MSGPACK_VERSION_MAJOR >= 1 */ #endif /* GRN_WITH_MESSAGE_PACK */ -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180403/94260ff0/attachment-0001.htm
