Kouhei Sutou
null+****@clear*****
Wed Apr 17 18:17:25 JST 2013
Kouhei Sutou 2013-04-17 18:17:25 +0900 (Wed, 17 Apr 2013) New Revision: fd22e522c23d960f0a32ed34ee37f9eb4073e490 https://github.com/groonga/groonga/commit/fd22e522c23d960f0a32ed34ee37f9eb4073e490 Message: Add "_" as prefix to avoid name collision We cannot use "GRN_BULK_REWIND(body)" without this change. Modified files: include/groonga.h Modified: include/groonga.h (+5 -5) =================================================================== --- include/groonga.h 2013-04-16 13:23:16 +0900 (5396d83) +++ include/groonga.h 2013-04-17 18:17:25 +0900 (82e5971) @@ -2153,12 +2153,12 @@ GRN_API const char *grn_default_query_logger_get_path(void); #define GRN_BULK_OUTP(bulk) ((bulk)->header.impl_flags & GRN_OBJ_OUTPLACE) #define GRN_BULK_REWIND(bulk) do {\ if ((bulk)->header.type == GRN_VECTOR) {\ - grn_obj *body = (bulk)->u.v.body;\ - if (body) {\ - if (GRN_BULK_OUTP(body)) {\ - (body)->u.b.curr = (body)->u.b.head;\ + grn_obj *_body = (bulk)->u.v.body;\ + if (_body) {\ + if (GRN_BULK_OUTP(_body)) {\ + (_body)->u.b.curr = (_body)->u.b.head;\ } else {\ - (body)->header.flags = 0;\ + (_body)->header.flags = 0;\ }\ }\ (bulk)->u.v.n_sections = 0;\ -------------- next part -------------- HTML����������������������������...Download