diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-29 22:00:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-29 22:00:34 +0000 |
| commit | b9bdeb035c1a182d48918c41ab13f8f122272a51 (patch) | |
| tree | 9fd56638e1f769df97cf802d3391104863d09f5d | |
| parent | a51d3fd03b7b9bc40e084bdb374d27f54877930d (diff) | |
* ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/tk/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 4 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Sun Mar 30 07:00:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet. + Sat Mar 29 14:18:41 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5. diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index cb7621fbd4..4311aecce0 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -322,6 +322,8 @@ if have_header("tcl.h") && have_header("tk.h") && $INSTALLFILES ||= [] $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"] + have_func("rb_hash_lookup", "ruby.h") + # create $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"] $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"] diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 18e0fd76fb..51e2b65198 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -189,6 +189,10 @@ static Tcl_ObjType *Tcl_ObjType_String; #endif #endif +#ifndef HAVE_RB_HASH_LOOKUP +#define rb_hash_lookup rb_hash_aref +#endif + /* safe Tcl_Eval and Tcl_GlobalEval */ static int #ifdef RUBY_VM @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-03-29" +#define RUBY_RELEASE_DATE "2008-03-30" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080329 +#define RUBY_RELEASE_CODE 20080330 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_DAY 30 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |