yugui	2011-07-03 21:23:38 +0900 (Sun, 03 Jul 2011)

  New Revision: 32377

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32377

  Log:
    merges r31948 from trunk into ruby_1_9_2.
    --
    * time.c (rb_gmtime_r2): adjust indent.

  Modified files:
    branches/ruby_1_9_2/time.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/time.c
===================================================================
--- ruby_1_9_2/time.c	(revision 32376)
+++ ruby_1_9_2/time.c	(revision 32377)
@@ -905,20 +905,20 @@
 #define LOCALTIME(tm, result) (tzset(),rb_localtime_r2((tm), &(result)))
 
 #if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
-    static struct tm *
-    rb_gmtime_r2(const time_t *t, struct tm *result)
-    {
-        result = rb_gmtime_r(t, result);
+static struct tm *
+rb_gmtime_r2(const time_t *t, struct tm *result)
+{
+    result = rb_gmtime_r(t, result);
 #if defined(HAVE_TIMEGM) && defined(LOCALTIME_OVERFLOW_PROBLEM)
-        if (result) {
-            struct tm tmp = *result;
-            time_t t2 = timegm(&tmp);
-            if (*t != t2)
-                result = NULL;
-        }
+    if (result) {
+	struct tm tmp = *result;
+	time_t t2 = timegm(&tmp);
+	if (*t != t2)
+	    result = NULL;
+    }
 #endif
-        return result;
-    }
+    return result;
+}
 #   define GMTIME(tm, result) rb_gmtime_r2((tm), &(result))
 #endif
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32376)
+++ ruby_1_9_2/version.h	(revision 32377)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 276
+#define RUBY_PATCHLEVEL 277
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/