On Wed, 2010-04-21 at 18:43 +0100, Nicholas Marriott wrote: > Do we need to include curses.h as well instead of ncurses.h?
Why include (n)curses.h at all? tmux only makes terminfo(3) calls, so it only needs to include term.h Thanks Roy
Index: configure =================================================================== RCS file: /cvsroot/tmux/tmux/configure,v retrieving revision 1.49 diff -u -p -r1.49 configure --- configure 5 Apr 2010 22:28:25 -0000 1.49 +++ configure 21 Apr 2010 19:07:20 -0000 @@ -250,10 +250,20 @@ EOF #define HAVE_UTIL_H #define HAVE_U_INT EOF - cat <<EOF >>$CONFIG_MK + # NetBSD-6 has it's own terminfo implementation + if test -f /lib/libterminfo.so; then + cat <<EOF >>$CONFIG_MK +LIBS+= -lterminfo +EOF + else + cat <<EOF >>$CONFIG_MK CPPFLAGS+= -I/usr/pkg/include LDFLAGS+= -L/usr/pkg/lib -LIBS+= -lncurses -lcrypt -lutil -levent +LIBS+= -lncurses +EOF + fi + cat <<EOF >>$CONFIG_MK +LIBS+= -lcrypt -lutil -levent SRCS+= osdep-netbsd.c \ compat/strtonum.c \ compat/vis.c \ Index: tty-term.c =================================================================== RCS file: /cvsroot/tmux/tmux/tty-term.c,v retrieving revision 1.41 diff -u -p -r1.41 tty-term.c --- tty-term.c 18 Dec 2009 07:42:30 -0000 1.41 +++ tty-term.c 21 Apr 2010 19:07:21 -0000 @@ -18,11 +18,6 @@ #include <sys/types.h> -#ifdef HAVE_BROKEN_CURSES_H -#include <ncurses.h> -#else -#include <curses.h> -#endif #include <fnmatch.h> #include <stdlib.h> #include <string.h>
------------------------------------------------------------------------------
_______________________________________________ tmux-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tmux-users
