summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-16 09:49:17 +0000
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-16 09:49:17 +0000
commitf5b033cd4ee66a2fe3123573478eedf5612ffb33 (patch)
tree56b375096f8e16408998adbd7d26cb51a08dbb88 /ext
parent07784c78b95dc8cd88518387adb987433b37db61 (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/date/date_core.c8
-rw-r--r--ext/date/date_strftime.c3
-rw-r--r--ext/date/date_tmx.h2
3 files changed, 6 insertions, 7 deletions
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index d84d14c..783fbd7 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -6813,10 +6813,10 @@ tmx_m_msecs(union DateData *x)
return s;
}
-static VALUE
+static int
tmx_m_of(union DateData *x)
{
- return INT2FIX(m_of(x));
+ return m_of(x);
}
static char *
@@ -6842,7 +6842,7 @@ static struct tmx_funcs tmx_funcs = {
(VALUE (*)(void *))m_sf_in_sec,
(VALUE (*)(void *))tmx_m_secs,
(VALUE (*)(void *))tmx_m_msecs,
- (VALUE (*)(void *))tmx_m_of,
+ (int (*)(void *))tmx_m_of,
(char *(*)(void *))tmx_m_zone
};
@@ -8650,7 +8650,7 @@ dt_lite_jisx0301(int argc, VALUE *argv, VALUE self)
static VALUE
time_to_time(VALUE self)
{
- return rb_funcall(self, rb_intern("getlocal"), 0);
+ return f_getlocal(self);
}
/*
diff --git a/ext/date/date_strftime.c b/ext/date/date_strftime.c
index b162413..87cb0a7 100644
--- a/ext/date/date_strftime.c
+++ b/ext/date/date_strftime.c
@@ -424,8 +424,7 @@ date_strftime_with_tmx(char *s, size_t maxsize, const char *format,
long off, aoff;
int hl, hw;
- off = NUM2LONG(rb_funcall(tmx_offset, rb_intern("round"), 0));
-
+ off = tmx_offset;
aoff = off;
if (aoff < 0)
aoff = -off;
diff --git a/ext/date/date_tmx.h b/ext/date/date_tmx.h
index 0e56c9b..ed06501 100644
--- a/ext/date/date_tmx.h
+++ b/ext/date/date_tmx.h
@@ -18,7 +18,7 @@ struct tmx_funcs {
VALUE (*sec_fraction)(void *dat);
VALUE (*secs)(void *dat);
VALUE (*msecs)(void *dat);
- VALUE (*offset)(void *dat);
+ int (*offset)(void *dat);
char *(*zone)(void *dat);
};
struct tmx {