From c29ad01850a994bdc9d931b341fbb494de41fd21 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 22 Jul 2016 19:06:07 +0000 Subject: [PATCH] ruby.h: use prefixed name * include/ruby/ruby.h (RTEST, NIL_P): use RUBY prefixed name in macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/ruby.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92fafd9451..d1d239058b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 23 04:06:04 2016 Nobuyoshi Nakada + + * include/ruby/ruby.h (RTEST, NIL_P): use RUBY prefixed name in + macros. + Sat Jul 23 01:41:29 2016 Eric Wong * lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 983ea2760c..4156c113c8 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -439,8 +439,8 @@ enum ruby_special_consts { #endif #define SYMBOL_FLAG RUBY_SYMBOL_FLAG -#define RTEST(v) !(((VALUE)(v) & ~Qnil) == 0) -#define NIL_P(v) !((VALUE)(v) != Qnil) +#define RTEST(v) !(((VALUE)(v) & ~RUBY_Qnil) == 0) +#define NIL_P(v) !((VALUE)(v) != RUBY_Qnil) #define CLASS_OF(v) rb_class_of((VALUE)(v))