summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-22 19:06:07 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-22 19:06:07 +0000
commitc29ad01850a994bdc9d931b341fbb494de41fd21 (patch)
tree15de57598c596f63fe8fbb36b6c9bf47fa1d50b9
parent79d33a5cfc0ea10a27d1dc83cdb899e2c086fab7 (diff)
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
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/ruby.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 92fafd9..d1d2390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 23 04:06:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (RTEST, NIL_P): use RUBY prefixed name in
+ macros.
+
Sat Jul 23 01:41:29 2016 Eric Wong <e@80x24.org>
* lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 983ea27..4156c11 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))