aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/ruby.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 92fb3ae07d..371c559b34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 1 16:03:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (ruby_safe_level_4_warning): needed by extension
+ libraries which check safe level 4. [ruby-dev:47517] [Bug #8652]
+
Mon Sep 30 23:14:36 2013 Zachary Scott <e@zzak.io>
* ext/objspace/objspace.c: [DOC] Cleaned up many rdoc formatting
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 0a8407ab92..d0ba1c2df6 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -568,10 +568,9 @@ 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_error(void) __attribute__((error("$SAFE=4 is obsolete")));
+int ruby_safe_level_4_warning(void) __attribute__((warning("$SAFE=4 is obsolete")));
# ifdef RUBY_EXPORT
# define ruby_safe_level_4_warning() ruby_safe_level_4_error()
-# else
-int ruby_safe_level_4_warning(void) __attribute__((warning("$SAFE=4 is obsolete")));
# endif
#define RUBY_SAFE_LEVEL_INVALID_P(level) \
__extension__(__builtin_constant_p(level) && \