archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r31948 from trunk into ruby_1_9_2.

Browse source 
--
* time.c (rb_gmtime_r2): adjust indent.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-07-03 12:23:38 +00:00
parent 185a5a726c
commit fe21cf8b36
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
time.c
View file

@ -905,20 +905,20 @@ rb_localtime_r2(const time_t *t, struct tm *result)
#define LOCALTIME(tm, result) (tzset(),rb_localtime_r2((tm), &(result))) #define LOCALTIME(tm, result) (tzset(),rb_localtime_r2((tm), &(result)))
#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) #if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
static struct tm * static struct tm *
rb_gmtime_r2(const time_t *t, struct tm *result) rb_gmtime_r2(const time_t *t, struct tm *result)
{ {
result = rb_gmtime_r(t, result); result = rb_gmtime_r(t, result);
#if defined(HAVE_TIMEGM) && defined(LOCALTIME_OVERFLOW_PROBLEM) #if defined(HAVE_TIMEGM) && defined(LOCALTIME_OVERFLOW_PROBLEM)
if (result) { if (result) {
struct tm tmp = *result; struct tm tmp = *result;
time_t t2 = timegm(&tmp); time_t t2 = timegm(&tmp);
if (*t != t2) if (*t != t2)
result = NULL; result = NULL;
}
#endif
return result;
} }
#endif
return result;
}
# define GMTIME(tm, result) rb_gmtime_r2((tm), &(result)) # define GMTIME(tm, result) rb_gmtime_r2((tm), &(result))
#endif #endif

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 276 #define RUBY_PATCHLEVEL 277
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1