diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-22 12:59:27 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-22 12:59:27 +0000 |
commit | ec6f077809d87aa3f529e0fc233297653608a283 (patch) | |
tree | b69c6d4e4c5b56fddebd3c772afc8985f65e2c4a | |
parent | 3d85d6edb5064848fea9a27727eb0a7a6d525417 (diff) | |
download | ruby-ec6f077809d87aa3f529e0fc233297653608a283.tar.gz |
* vm_core.h (enum): avoid syntax error.
* method.h: ditto.
* internal.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | internal.h | 2 | ||||
-rw-r--r-- | method.h | 2 | ||||
-rw-r--r-- | vm_core.h | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Tue Oct 22 21:58:28 2013 URABE Shyouhei <shyouhei@ruby-lang.org> + + * vm_core.h (enum): avoid syntax error. + + * method.h: ditto. + + * internal.h: ditto. + Tue Oct 22 19:53:16 2013 Koichi Sasada <ko1@atdot.net> * gc.c (Init_heap): move logics from heap_pages_init() and remove diff --git a/internal.h b/internal.h index c9ac343850..77e2bd090b 100644 --- a/internal.h +++ b/internal.h @@ -430,7 +430,7 @@ void *ruby_mimmalloc(size_t size); void rb_objspace_set_event_hook(const rb_event_flag_t event); void rb_gc_writebarrier_remember_promoted(VALUE obj); -void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_ALLOC_SIZE((2));; +void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_ALLOC_SIZE((2)); void ruby_sized_xfree(void *x, size_t size); #define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_sized_xrealloc((char*)(var), (n) * sizeof(type), (old_n) * sizeof(type))) @@ -14,7 +14,7 @@ #include "internal.h" #ifndef END_OF_ENUMERATION -# ifdef __GNUC__ +# if defined(__GNUC__) &&! defined(__STRICT_ANSI__) # define END_OF_ENUMERATION(key) # else # define END_OF_ENUMERATION(key) END_OF_##key##_PLACEHOLDER = 0 @@ -642,7 +642,7 @@ typedef enum { VM_DEFINECLASS_TYPE_SINGLETON_CLASS = 0x01, VM_DEFINECLASS_TYPE_MODULE = 0x02, /* 0x03..0x06 is reserved */ - VM_DEFINECLASS_TYPE_MASK = 0x07, + VM_DEFINECLASS_TYPE_MASK = 0x07 } rb_vm_defineclass_type_t; #define VM_DEFINECLASS_TYPE(x) ((rb_vm_defineclass_type_t)(x) & VM_DEFINECLASS_TYPE_MASK) |