diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 18:59:34 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 18:59:34 +0000 |
commit | 0d029c6012f07b98a7344b0e2bfaee892a209a69 (patch) | |
tree | 4b5b92624f698f65fc8a38113735f62b138faa3a | |
parent | d56b279b6644ee83865dd1dd694e4ae925e050b6 (diff) |
merge revision(s) 13936:13938:
* ext/curses/extconf.rb: check macro if cannot find func.
[ruby-list:44224]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/curses/extconf.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jun 8 03:59:31 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/curses/extconf.rb: check macro if cannot find func. + [ruby-list:44224] + Sun Jun 8 03:52:53 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/cgi/session.rb (CGI::Session::FileStore::restore): use diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb index 01fe971093..0124bbbf4a 100644 --- a/ext/curses/extconf.rb +++ b/ext/curses/extconf.rb @@ -20,7 +20,7 @@ end 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];" @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 146 +#define RUBY_PATCHLEVEL 147 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |