summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--time.c24
-rw-r--r--version.h2
2 files changed, 13 insertions, 13 deletions
diff --git a/time.c b/time.c
index 8d7fc868a1..ac69da64ef 100644
--- a/time.c
+++ b/time.c
@@ -905,20 +905,20 @@ rb_localtime_r2(const time_t *t, struct tm *result)
#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;
- }
-#endif
- return result;
+ if (result) {
+ struct tm tmp = *result;
+ time_t t2 = timegm(&tmp);
+ if (*t != t2)
+ result = NULL;
}
+#endif
+ return result;
+}
# define GMTIME(tm, result) rb_gmtime_r2((tm), &(result))
#endif
diff --git a/version.h b/version.h
index 287ac5eb08..99774e89c3 100644
--- a/version.h
+++ b/version.h
@@ -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