summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-18 06:11:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-18 06:11:16 +0000
commit0ef059b217c290e7828ba208bf8d03d7e87be61e (patch)
treedc59d5daa49debc1e3244870af2514d462eb12ef
parent6429bbad5925caf111810f720f6abfbc36deb350 (diff)
ruby.h: no $
* include/ruby/ruby.h (ruby_safe_level_4): get rid of special character. [ruby-dev:47512] [misc #8646] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42035 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 e0ee39eb01..850778091c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 18 15:11:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (ruby_safe_level_4): get rid of special
+ character. [ruby-dev:47512] [misc #8646]
+
Thu Jul 18 14:51:39 2013 Koichi Sasada <ko1@atdot.net>
* array.c (ary_alloc): slim setup process.
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 91efa39db9..7812ee202a 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -567,12 +567,12 @@ void rb_secure(int);
int rb_safe_level(void);
void rb_set_safe_level(int);
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-int ruby$safe_level$4(void) __attribute__((error("$SAFE=4 is obsolete")));
+int ruby_safe_level_4(void) __attribute__((error("$SAFE=4 is obsolete")));
#define RUBY_SAFE_LEVEL_INVALID_P(level) \
__extension__(__builtin_constant_p(level) && \
((level) < 0 || RUBY_SAFE_LEVEL_MAX < (level)))
#define RUBY_SAFE_LEVEL_CHECK(level) \
- (RUBY_SAFE_LEVEL_INVALID_P(level) ? ruby$safe_level$4() : (level))
+ (RUBY_SAFE_LEVEL_INVALID_P(level) ? ruby_safe_level_4() : (level))
#define rb_secure(level) rb_secure(RUBY_SAFE_LEVEL_CHECK(level))
#define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level))
#endif