* ext/zlib/zlib.c: added a prototype to get rid of SEGV on x86_64

  darwin.
  Reported by kosaki and nagachika. Patch by nagachika.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ce5fb8797..76cf5b1143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul  3 22:40:37 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/zlib/zlib.c: added a prototype to get rid of SEGV on x86_64
+	  darwin.
+	  Reported by kosaki and nagachika. Patch by nagachika.
+
 Sun Jul  3 21:02:05 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* ext/socket/extconf.rb (have_type("PADDRINFO")): new check.
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index c454d26e04..1195e6630f 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -2388,6 +2388,8 @@ gzfile_reader_rewind(struct gzfile *gz)
     gzfile_reset(gz);
 }
 
+extern VALUE rb_str_resurrect(VALUE str);
+
 static VALUE
 gzfile_reader_get_unused(struct gzfile *gz)
 {
diff --git a/version.h b/version.h
index 38f6f2497d..5e16a228fd 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 287
+#define RUBY_PATCHLEVEL 288
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1