merges r29952 from trunk into ruby_1_9_2.

--
* time.c: parenthesize macro arguments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 6159b57ad6..ce942e742d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 27 19:12:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: parenthesize macro arguments.
+
 Sat Nov 27 18:08:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (leap_year_v_p): fixed typo.  [ruby-dev:42631]
diff --git a/time.c b/time.c
index 0cde020b89..2e53170151 100644
--- a/time.c
+++ b/time.c
@@ -184,7 +184,7 @@ quo(VALUE x, VALUE y)
     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 @@ static int leap_year_p(long y);
 #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)
@@ -1762,9 +1762,9 @@ struct time_object {
 };
 
 #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)
@@ -2703,7 +2703,7 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp)
     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;
diff --git a/version.h b/version.h
index 15dbe6de45..fb4ac70ead 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 108
+#define RUBY_PATCHLEVEL 109
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1