diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-25 08:34:00 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-25 08:34:00 +0000 |
| commit | afa7c15d6e67af1bf8f90da4989be8b8615a16f6 (patch) | |
| tree | 9d96377300dccba7046dd234e50bea709950e647 | |
| parent | e56b9b4383a4d8b62a43a2b851aabeb2a7f96259 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ruby_assert.h | 2 | ||||
| -rw-r--r-- | vm_core.h | 3 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Jan 25 17:26:54 2016 Eric Wong <e@80x24.org> + + * 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@ruby-lang.org> * symbol.c (sym_check_asciionly): more informative error message diff --git a/ruby_assert.h b/ruby_assert.h index de8049151f..3383e4fc6c 100644 --- a/ruby_assert.h +++ b/ruby_assert.h @@ -31,7 +31,7 @@ NORETURN(void rb_assert_failure(const char *, int, const char *, const char *)); 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 @@ -42,6 +42,8 @@ #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 @@ #include "method.h" #include "ruby_atomic.h" #include "ccan/list/list.h" -#include "ruby_assert.h" #include "ruby/thread_native.h" #if defined(_WIN32) |