Added another possible naming convention for the ncursesw header

ELLIOTTCABLE · Jun 6, 2009 · c121b7b · c121b7b
1 parent abb3229
commit c121b7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ext/ncurses/extconf.rb b/ext/ncurses/extconf.rb
@@ -32,7 +32,7 @@
 # ===================
 # = Ncurses headers =
 # ===================
-%w(ncursesw ncursesw/ncursesw ncursesw/cursesw ncursesw/curses cursesw).each do |h|
+%w(ncursesw/ncursesw ncursesw/ncurses ncursesw ncursesw/cursesw ncursesw/curses cursesw).each do |h|
   break if @have_ncursesw_header = have_header("#{h}.h")
 end
 STDERR.puts 'WARNING: Ncurses widechar headers missing! Did you configure ncurses with `--enable-widec`? We will attempt to build without widech support!' unless @have_ncursesw_header

diff --git a/ext/ncurses/ncurses_wrap.h b/ext/ncurses/ncurses_wrap.h
@@ -72,14 +72,14 @@ int close(int);
 
 #ifdef HAVE_NCURSESW_NCURSESW_H
 #  include <ncursesw/ncursesw.h>
-#elif HAVE_NCURSESW_CURSESW_H
-#  include <ncursesw/cursesw.h>
 #elif HAVE_NCURSESW_NCURSES_H
 #  include <ncursesw/ncurses.h>
-#elif HAVE_NCURSESW_CURSES_H
-#  include <ncursesw/curses.h>
 #elif HAVE_NCURSESW_H
 #  include <ncursesw.h>
+#elif HAVE_NCURSESW_CURSESW_H
+#  include <ncursesw/cursesw.h>
+#elif HAVE_NCURSESW_CURSES_H
+#  include <ncursesw/curses.h>
 #elif HAVE_CURSESW_H
 #  include <cursesw.h>
 #elif HAVE_NCURSES_NCURSES_H