[前][次][番号順一覧][スレッド一覧]

ruby-changes:31311

From: shyouhei <ko1@a...>
Date: Tue, 22 Oct 2013 21:59:34 +0900 (JST)
Subject: [ruby-changes:31311] shyouhei:r43390 (trunk): * vm_core.h (enum): avoid syntax error.

shyouhei	2013-10-22 21:59:27 +0900 (Tue, 22 Oct 2013)

  New Revision: 43390

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43390

  Log:
    * vm_core.h (enum): avoid syntax error.
    
    * method.h: ditto.
    
    * internal.h: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/internal.h
    trunk/method.h
    trunk/vm_core.h
Index: method.h
===================================================================
--- method.h	(revision 43389)
+++ method.h	(revision 43390)
@@ -14,7 +14,7 @@ https://github.com/ruby/ruby/blob/trunk/method.h#L14
 #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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43389)
+++ ChangeLog	(revision 43390)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Oct 22 21:58:28 2013  URABE Shyouhei  <shyouhei@r...>
+
+	* vm_core.h (enum): avoid syntax error.
+
+	* method.h: ditto.
+
+	* internal.h: ditto.
+
 Tue Oct 22 19:53:16 2013  Koichi Sasada  <ko1@a...>
 
 	* gc.c (Init_heap): move logics from heap_pages_init() and remove
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 43389)
+++ vm_core.h	(revision 43390)
@@ -642,7 +642,7 @@ typedef enum { https://github.com/ruby/ruby/blob/trunk/vm_core.h#L642
     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)
Index: internal.h
===================================================================
--- internal.h	(revision 43389)
+++ internal.h	(revision 43390)
@@ -430,7 +430,7 @@ void *ruby_mimmalloc(size_t size); https://github.com/ruby/ruby/blob/trunk/internal.h#L430
 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)))
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]