ruby-changes:17936
From: akr <ko1@a...>
Date: Sat, 27 Nov 2010 19:12:55 +0900 (JST)
Subject: [ruby-changes:17936] Ruby:r29952 (trunk): * time.c: parenthesize macro arguments.
akr 2010-11-27 19:12:48 +0900 (Sat, 27 Nov 2010) New Revision: 29952 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29952 Log: * time.c: parenthesize macro arguments. Modified files: trunk/ChangeLog trunk/time.c Index: time.c =================================================================== --- time.c (revision 29951) +++ time.c (revision 29952) @@ -184,7 +184,7 @@ return ret; } -#define mulquo(x,y,z) ((y == z) ? x : quo(mul(x,y),z)) +#define mulquo(x,y,z) (((y) == (z)) ? (x) : quo(mul((x),(y)),(z))) static void divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r) @@ -856,8 +856,8 @@ #define leap_year_v_p(y) leap_year_p(NUM2LONG(mod((y), INT2FIX(400)))) #ifdef HAVE_GMTIME_R -#define rb_gmtime_r(t, tm) gmtime_r(t, tm) -#define rb_localtime_r(t, tm) localtime_r(t, tm) +#define rb_gmtime_r(t, tm) gmtime_r((t), (tm)) +#define rb_localtime_r(t, tm) localtime_r((t), (tm)) #else static inline struct tm * rb_gmtime_r(const time_t *tp, struct tm *result) @@ -1799,9 +1799,9 @@ }; #define GetTimeval(obj, tobj) \ - TypedData_Get_Struct(obj, struct time_object, &time_data_type, tobj) + TypedData_Get_Struct((obj), struct time_object, &time_data_type, (tobj)) -#define IsTimeval(obj) rb_typeddata_is_kind_of(obj, &time_data_type) +#define IsTimeval(obj) rb_typeddata_is_kind_of((obj), &time_data_type) #define TIME_UTC_P(tobj) ((tobj)->gmt == 1) #define TIME_SET_UTC(tobj) ((tobj)->gmt = 1) @@ -2740,7 +2740,7 @@ int status; int tptr_tm_yday; -#define GUESS(p) (DEBUG_FIND_TIME_NUMGUESS_INC (utc_p ? gmtime_with_leapsecond(p, &result) : LOCALTIME(p, result))) +#define GUESS(p) (DEBUG_FIND_TIME_NUMGUESS_INC (utc_p ? gmtime_with_leapsecond((p), &result) : LOCALTIME((p), result))) guess_lo = TIMET_MIN; guess_hi = TIMET_MAX; Index: ChangeLog =================================================================== --- ChangeLog (revision 29951) +++ ChangeLog (revision 29952) @@ -1,3 +1,7 @@ +Sat Nov 27 19:12:10 2010 Tanaka Akira <akr@f...> + + * time.c: parenthesize macro arguments. + Sat Nov 27 18:08:18 2010 Nobuyoshi Nakada <nobu@r...> * time.c (leap_year_v_p): fixed typo. [ruby-dev:42631] -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/