summaryrefslogtreecommitdiffstats
path: root/time.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-10 01:08:15 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-10 01:08:15 +0000
commit0e3b349f7a250e14c8c93b52507e557344bce800 (patch)
tree8edb1a59d129300539245135b80194271cf63870 /time.c
parenta707c831123cdabfe6a173c9f6cbcc86e6e7c9ce (diff)
downloadruby-0e3b349f7a250e14c8c93b52507e557344bce800.tar.gz
ruby-0e3b349f7a250e14c8c93b52507e557344bce800.tar.xz
ruby-0e3b349f7a250e14c8c93b52507e557344bce800.zip
* eval.c (proc_invoke): should not overwrite block information in
current frame. [ruby-dev:28957] * eval.c (rb_yield_0): retrieve proper block object from the frame record. * eval.c (proc_alloc): return preserved block object if it's available. * st.h (st_data_t): use pointer sized integer for st_data_t. [ruby-dev:28988] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/time.c b/time.c
index ffaad3baa..62be1f521 100644
--- a/time.c
+++ b/time.c
@@ -1924,7 +1924,7 @@ time_mdump(VALUE time)
if ((tm->tm_year & 0xffff) != tm->tm_year)
rb_raise(rb_eArgError, "year too big to marshal");
- p = 0x1UL << 31 | /* 1 */
+ p = 0x1UL << 31 | /* 1 */
tobj->gmt << 30 | /* 1 */
tm->tm_year << 14 | /* 16 */
tm->tm_mon << 10 | /* 4 */