summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-11 02:57:02 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-11 02:57:02 +0000
commit9b29e5f7e1855f5381227363970e4ff21f3e4ae6 (patch)
tree93c34c3e1b87149444f938e68242db355d4d143b
parent9ea35ccf306cda49f3ec1ab02ae1570f68e02765 (diff)
* 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
-rw-r--r--ChangeLog10
-rw-r--r--compile.c9
-rw-r--r--vm_backtrace.c2
3 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c478ead..66f0197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jun 11 11:52:18 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * 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 <akr@fsij.org>
* process.c (rb_proc_exec_n): revert the function removed at r35889.
diff --git a/compile.c b/compile.c
index 6c1e218..5d028c9 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 93a8537..d2e519b 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 {