null+****@clear*****
null+****@clear*****
2010年 7月 6日 (火) 14:00:37 JST
Kouhei Sutou 2010-07-06 05:00:37 +0000 (Tue, 06 Jul 2010) New Revision: a61d067949e8e2b7b9b69441bae5f9c2c237a0bf Log: fix name collision. Modified files: groonga.h Modified: groonga.h (+3 -3) =================================================================== --- groonga.h 2010-07-06 04:45:51 +0000 (91cb6a5) +++ groonga.h 2010-07-06 05:00:37 +0000 (d547df7) @@ -1943,10 +1943,10 @@ GRN_API void grn_time_now(grn_ctx *ctx, grn_obj *obj); #define GRN_TIME_VALUE GRN_INT64_VALUE #define GRN_RECORD_VALUE(obj) (*((grn_id *)GRN_BULK_HEAD(obj))) #define GRN_PTR_VALUE(obj) (*((grn_obj **)GRN_BULK_HEAD(obj))) -#define GRN_GEO_POINT_VALUE(obj,latitude,longitude) do {\ +#define GRN_GEO_POINT_VALUE(obj,_latitude,_longitude) do {\ grn_geo_point *_val = (grn_geo_point *)GRN_BULK_HEAD(obj);\ - latitude = _val->latitude;\ - longitude = _val->longitude;\ + _latitude = _val->latitude;\ + _longitude = _val->longitude;\ } while (0) #define GRN_BOOL_VALUE_AT(obj,offset) (((unsigned char *)GRN_BULK_HEAD(obj))[offset])