From a4ec0fb4da43c6344bc0389f7c4bf8111441843a Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Oct 2009 22:40:22 +0000
Subject: * ext/tk/tcltklib.c,stubs.c: remove errors or warnings when compiled 
  with old ruby 1.8.x. * ext/tk/tkutil/tkutil.c: ditto.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/stubs.c         |  6 ++++++
 ext/tk/tcltklib.c      | 11 ++++++++++-
 ext/tk/tkutil/tkutil.c | 18 +++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'ext')

diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index 4388fb294..762fe5ea8 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -6,6 +6,12 @@
 
 #include "ruby.h"
 #include "stubs.h"
+
+#if !defined(RSTRING_PTR)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
 #include <tcl.h>
 #include <tk.h>
 
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index 2938536cd..2052582b7 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -4,7 +4,7 @@
  *              Oct. 24, 1997   Y. Matsumoto
  */
 
-#define TCLTKLIB_RELEASE_DATE "2009-08-09"
+#define TCLTKLIB_RELEASE_DATE "2009-10-27"
 
 #include "ruby.h"
 
@@ -24,6 +24,15 @@ int rb_thread_check_trap_pending();
 #include "rubysig.h"
 #endif
 
+a#if !defined(RSTRING_PTR)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+#if !defined(RARRAY_PTR)
+#define RARRAY_PTR(s) (RARRAY(s)->ptr)
+#define RARRAY_LEN(s) (RARRAY(s)->len)
+#endif
+
 #ifdef OBJ_UNTRUST
 #define RbTk_OBJ_UNTRUST(x)  do {OBJ_TAINT(x); OBJ_UNTRUST(x);} while (0)
 #else
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index 25011bb47..6a670ce6f 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -7,7 +7,7 @@
 
 ************************************************/
 
-#define TKUTIL_RELEASE_DATE "2009-07-12"
+#define TKUTIL_RELEASE_DATE "2009-10-27"
 
 #include "ruby.h"
 
@@ -23,6 +23,22 @@ static VALUE rb_thread_critical; /* dummy */
 #include "st.h"
 #endif
 
+#if !defined(RHASH_TBL)
+#define RHASH_TBL(h) (RHASH(h)->tbl)
+#endif
+#if !defined(RSTRING_PTR)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+#if !defined(RARRAY_PTR)
+#define RARRAY_PTR(s) (RARRAY(s)->ptr)
+#define RARRAY_LEN(s) (RARRAY(s)->len)
+#endif
+
+#if defined(HAVE_STRNDUP) && !defined(_GNU_SOURCE)
+extern char *strndup(const char* _ptr, size_t _len);
+#endif
+
 static VALUE cMethod;
 
 static VALUE cTclTkLib;
-- 
cgit