From 1031c207140cd3d3a02305539f128f044e2e006b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 19 Jul 2009 05:03:30 +0000
Subject: [PATCH] * configure.in (DEPRECATED): backported from trunk.

* eval.c (rb_mod_autoload): should use SafeStringValue() instead
  obsolete Check_SafeStr().

* ruby.h (rb_check_safe_str, rb_str2cstr): deprecation warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@24202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 9 +++++++++
 configure.in | 1 +
 eval.c       | 2 +-
 ruby.h       | 7 +++++--
 version.h    | 6 +++---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9d1adb62e..586b9bfdd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Jul 19 14:03:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DEPRECATED): backported from trunk.
+
+	* eval.c (rb_mod_autoload): should use SafeStringValue() instead
+	  obsolete Check_SafeStr().
+
+	* ruby.h (rb_check_safe_str, rb_str2cstr): deprecation warning.
+
 Sat Jul 18 12:05:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.h (RFLOAT_VALUE, RSTRING_END, RREGEXP_SRC_*, RBIGNUM_*):
diff --git a/configure.in b/configure.in
index e7859d6e60..a0b6633d45 100644
--- a/configure.in
+++ b/configure.in
@@ -382,6 +382,7 @@ AS_VAR_POPDEF([rbcv])
 ])
 
 RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
+RUBY_FUNC_ATTRIBUTE(deprecated, DEPRECATED)
 RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
 
 AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
diff --git a/eval.c b/eval.c
index 65c1dfd36a..ab8356b3f2 100644
--- a/eval.c
+++ b/eval.c
@@ -8388,7 +8388,7 @@ rb_mod_autoload(mod, sym, file)
 {
     ID id = rb_to_id(sym);
 
-    Check_SafeStr(file);
+    SafeStringValue(file);
     rb_autoload(mod, id, RSTRING(file)->ptr);
     return Qnil;
 }
diff --git a/ruby.h b/ruby.h
index 8e19cb6fa1..f03ce0d500 100644
--- a/ruby.h
+++ b/ruby.h
@@ -30,6 +30,9 @@ extern "C" {
 #ifndef NORETURN
 # define NORETURN(x) x
 #endif
+#ifndef DEPRECATED
+# define DEPRECATED(x) x
+#endif
 #ifndef NOINLINE
 # define NOINLINE(x) x
 #endif
@@ -239,7 +242,7 @@ char *rb_string_value_cstr _((volatile VALUE*));
 #define StringValueCStr(v) rb_string_value_cstr(&(v))
 
 void rb_check_safe_obj _((VALUE));
-void rb_check_safe_str _((VALUE));
+DEPRECATED(void rb_check_safe_str _((VALUE)));
 #define SafeStringValue(v) do {\
     StringValue(v);\
     rb_check_safe_obj(v);\
@@ -290,7 +293,7 @@ double rb_num2dbl _((VALUE));
 #define NUM2DBL(x) rb_num2dbl((VALUE)(x))
 
 /* obsolete API - use StringValue() */
-char *rb_str2cstr _((VALUE,long*));
+DEPRECATED(char *rb_str2cstr _((VALUE,long*)));
 /* obsolete API - use StringValuePtr() */
 #define STR2CSTR(x) rb_str2cstr((VALUE)(x),0)
 
diff --git a/version.h b/version.h
index c1eceb50af..723af51009 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2009-07-18"
+#define RUBY_RELEASE_DATE "2009-07-19"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20090718
+#define RUBY_RELEASE_CODE 20090719
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];