normal	2016-01-25 17:34:00 +0900 (Mon, 25 Jan 2016)

  New Revision: 53653

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53653

  Log:
    fix build with VM_CHECK_MODE > 0
    
    * ruby_assert.h (RUBY_ASSERT_WHEN): fix reference to macro name
    * vm_core.h: include ruby_assert.h before using
      [ruby-core:73371]
    
    This does not fix the test failure documented in [ruby-core:73371],
    that is for later.

  Modified files:
    trunk/ChangeLog
    trunk/ruby_assert.h
    trunk/vm_core.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53652)
+++ ChangeLog	(revision 53653)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Jan 25 17:26:54 2016  Eric Wong  <e@8...>
+
+	* ruby_assert.h (RUBY_ASSERT_WHEN): fix reference to macro name
+	* vm_core.h: include ruby_assert.h before using
+	  [ruby-core:73371]
+
 Mon Jan 25 15:55:30 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* symbol.c (sym_check_asciionly): more informative error message
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 53652)
+++ vm_core.h	(revision 53653)
@@ -42,6 +42,8 @@ https://github.com/ruby/ruby/blob/trunk/vm_core.h#L42
 #define VMDEBUG 3
 #endif
 
+#include "ruby_assert.h"
+
 #if VM_CHECK_MODE > 0
 #define VM_ASSERT(expr) ( \
 	RUBY_ASSERT_WHEN(VM_CHECK_MODE > 0, expr))
@@ -61,7 +63,6 @@ https://github.com/ruby/ruby/blob/trunk/vm_core.h#L63
 #include "method.h"
 #include "ruby_atomic.h"
 #include "ccan/list/list.h"
-#include "ruby_assert.h"
 
 #include "ruby/thread_native.h"
 #if   defined(_WIN32)
Index: ruby_assert.h
===================================================================
--- ruby_assert.h	(revision 53652)
+++ ruby_assert.h	(revision 53653)
@@ -31,7 +31,7 @@ NORETURN(void rb_assert_failure(const ch https://github.com/ruby/ruby/blob/trunk/ruby_assert.h#L31
     RUBY_ASSERT_MESG(!(cond) || (expr), mesg)
 #endif
 #define RUBY_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(!RUBY_NDEBUG+0, expr, #expr)
-#define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_WHEN_0(cond, expr, #expr)
+#define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_MESG_WHEN(cond, expr, #expr)
 
 #undef assert
 #define assert RUBY_ASSERT

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