diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-29 02:23:21 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-29 02:23:21 +0000 |
commit | 33d5c4848df9c000e80a28cc9ba1c5e63cfc631d (patch) | |
tree | dd7bedd9d0a75a2305a82679eef5a1e99e15af49 | |
parent | c30f4049f2f5935dc495d0c68bc299e7f8bdbcde (diff) |
merge revision(s) 36455: [Backport #6772]
* ext/curses/extconf.rb: support PDCurses. patched by Luis Lavena.
[ruby-core:46485] [Feature #6735]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ext/curses/extconf.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb index 4172c8a6b6..a1a1613aa7 100644 --- a/ext/curses/extconf.rb +++ b/ext/curses/extconf.rb @@ -16,7 +16,7 @@ elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "ini elsif have_header(*curses=%w"curses_colr/curses.h") and have_library("cur_colr", "initscr") curses.unshift("varargs.h") make=true -elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr") +elsif have_header(*curses=%w"curses.h") and (have_library("curses", "initscr") || have_library("pdcurses", "initscr")) make=true end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 257 +#define RUBY_PATCHLEVEL 258 #define RUBY_RELEASE_DATE "2012-07-29" #define RUBY_RELEASE_YEAR 2012 |