diff --git a/ChangeLog b/ChangeLog index 575fd60e73..a111a19a9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Oct 22 21:58:28 2013 URABE Shyouhei + + * vm_core.h (enum): avoid syntax error. + + * method.h: ditto. + + * internal.h: ditto. + Tue Oct 22 19:53:16 2013 Koichi Sasada * 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))) diff --git a/method.h b/method.h index c89df88bd2..9604722500 100644 --- a/method.h +++ b/method.h @@ -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 diff --git a/vm_core.h b/vm_core.h index 1af68a219f..e79fd7ccaf 100644 --- a/vm_core.h +++ b/vm_core.h @@ -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)