ruby-changes:5439
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 03:59:21 +0900 (JST)
Subject: [ruby-changes:5439] Ruby:r16941 (ruby_1_8_5): merge revision(s) 13936:13938:
shyouhei 2008-06-08 03:59:07 +0900 (Sun, 08 Jun 2008) New Revision: 16941 Modified files: branches/ruby_1_8_5/ChangeLog branches/ruby_1_8_5/ext/curses/extconf.rb branches/ruby_1_8_5/version.h Log: merge revision(s) 13936:13938: * ext/curses/extconf.rb: check macro if cannot find func. [ruby-list:44224] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16941&r2=16940&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/curses/extconf.rb?r1=16941&r2=16940&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16941&r2=16940&diff_format=u Index: ruby_1_8_5/ext/curses/extconf.rb =================================================================== --- ruby_1_8_5/ext/curses/extconf.rb (revision 16940) +++ ruby_1_8_5/ext/curses/extconf.rb (revision 16941) @@ -20,7 +20,7 @@ if make for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set) - have_func(f) + have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase))) end flag = "-D_XOPEN_SOURCE_EXTENDED" src = "int test_var[(sizeof(char*)>sizeof(int))*2-1];" Index: ruby_1_8_5/ChangeLog =================================================================== --- ruby_1_8_5/ChangeLog (revision 16940) +++ ruby_1_8_5/ChangeLog (revision 16941) @@ -1,3 +1,8 @@ +Sun Jun 8 03:54:52 2008 NAKAMURA Usaku <usa@r...> + + * ext/curses/extconf.rb: check macro if cannot find func. + [ruby-list:44224] + Sun Jun 8 03:50:40 2008 Yukihiro Matsumoto <matz@r...> * lib/cgi/session.rb (CGI::Session::FileStore::restore): use Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 16940) +++ ruby_1_8_5/version.h (revision 16941) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 147 +#define RUBY_PATCHLEVEL 148 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/