From 9b29e5f7e1855f5381227363970e4ff21f3e4ae6 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 11 Jun 2012 02:57:02 +0000 Subject: * compile.c (iseq_set_sequence): nonstatic initializer of an aggregate type is a C99ism. * compile.c (enum compile_array_type_t): comma at the end of enum list is a C99ism. * vm_backtrace.c (enum LOCATION_TYPE): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ compile.c | 9 +++++---- vm_backtrace.c | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c478ead24f..66f0197216 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Jun 11 11:52:18 2012 URABE Shyouhei + + * compile.c (iseq_set_sequence): nonstatic initializer of an + aggregate type is a C99ism. + + * compile.c (enum compile_array_type_t): comma at the end of enum + list is a C99ism. + + * vm_backtrace.c (enum LOCATION_TYPE): ditto. + Mon Jun 11 06:31:33 2012 Tanaka Akira * process.c (rb_proc_exec_n): revert the function removed at r35889. diff --git a/compile.c b/compile.c index 6c1e218b0f..5d028c9236 100644 --- a/compile.c +++ b/compile.c @@ -1449,9 +1449,10 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) case TS_CDHASH: { VALUE map = operands[j]; - struct cdhash_set_label_struct data = { - map, pos, len, - }; + struct cdhash_set_label_struct data; + data.hash = map; + data.pos = pos; + data.len = len; rb_hash_foreach(map, cdhash_set_label_i, (VALUE)&data); hide_obj(map); @@ -2271,7 +2272,7 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond, enum compile_array_type_t { COMPILE_ARRAY_TYPE_ARRAY, COMPILE_ARRAY_TYPE_HASH, - COMPILE_ARRAY_TYPE_ARGS, + COMPILE_ARRAY_TYPE_ARGS }; static int diff --git a/vm_backtrace.c b/vm_backtrace.c index 93a8537097..d2e519bbb6 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -44,7 +44,7 @@ typedef struct rb_backtrace_location_struct { LOCATION_TYPE_ISEQ = 1, LOCATION_TYPE_ISEQ_CALCED, LOCATION_TYPE_CFUNC, - LOCATION_TYPE_IFUNC, + LOCATION_TYPE_IFUNC } type; union { -- cgit v1.2.3