kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/date/date_tmx.h: offset in struct tmx_funcs is now int.

Browse source 
* ext/date/date_strftime.c: ditto.
	* ext/date/date_core.c: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2012-06-16 09:49:17 +00:00
parent 07784c78b9
commit f5b033cd4e
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Jun 16 18:46:57 2012 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_tmx.h: offset in struct tmx_funcs is now int.
* ext/date/date_strftime.c: ditto.
* ext/date/date_core.c: ditto.
Sat Jun 16 18:31:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 16 18:31:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (ruby_setup): set running state in the normal case before * eval.c (ruby_setup): set running state in the normal case before

8
ext/date/date_core.c
View file

@ -6813,10 +6813,10 @@ tmx_m_msecs(union DateData *x)
return s; return s;
} }
static VALUE static int
tmx_m_of(union DateData *x) tmx_m_of(union DateData *x)
{ {
return INT2FIX(m_of(x)); return m_of(x);
} }
static char * static char *
@ -6842,7 +6842,7 @@ static struct tmx_funcs tmx_funcs = {
(VALUE (*)(void *))m_sf_in_sec, (VALUE (*)(void *))m_sf_in_sec,
(VALUE (*)(void *))tmx_m_secs, (VALUE (*)(void *))tmx_m_secs,
(VALUE (*)(void *))tmx_m_msecs, (VALUE (*)(void *))tmx_m_msecs,
(VALUE (*)(void *))tmx_m_of, (int (*)(void *))tmx_m_of,
(char *(*)(void *))tmx_m_zone (char *(*)(void *))tmx_m_zone
}; };
@ -8650,7 +8650,7 @@ dt_lite_jisx0301(int argc, VALUE *argv, VALUE self)
static VALUE static VALUE
time_to_time(VALUE self) time_to_time(VALUE self)
{ {
return rb_funcall(self, rb_intern("getlocal"), 0); return f_getlocal(self);
} }
/* /*

3
ext/date/date_strftime.c
View file

@ -424,8 +424,7 @@ date_strftime_with_tmx(char *s, size_t maxsize, const char *format,
long off, aoff; long off, aoff;
int hl, hw; int hl, hw;
off = NUM2LONG(rb_funcall(tmx_offset, rb_intern("round"), 0)); off = tmx_offset;
aoff = off; aoff = off;
if (aoff < 0) if (aoff < 0)
aoff = -off; aoff = -off;

2
ext/date/date_tmx.h
View file

@ -18,7 +18,7 @@ struct tmx_funcs {
VALUE (*sec_fraction)(void *dat); VALUE (*sec_fraction)(void *dat);
VALUE (*secs)(void *dat); VALUE (*secs)(void *dat);
VALUE (*msecs)(void *dat); VALUE (*msecs)(void *dat);
VALUE (*offset)(void *dat); int (*offset)(void *dat);
char *(*zone)(void *dat); char *(*zone)(void *dat);
}; };
struct tmx { struct tmx {