From 7f512dd17fd831ea4e06bf509b99cb5358f2e7af Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 18:59:07 +0000 Subject: 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_5@16941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/curses/extconf.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47d6eef14b..68ddfe4527 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 8 03:54:52 2008 NAKAMURA Usaku + + * ext/curses/extconf.rb: check macro if cannot find func. + [ruby-list:44224] + Sun Jun 8 03:50:40 2008 Yukihiro Matsumoto * 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];" diff --git a/version.h b/version.h index 6a21454bb0..d12f64894a 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3