diff options
| author |   nicm <nicm@openbsd.org> | 2009-07-14 06:30:45 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2009-07-14 06:30:45 +0000 |
| commit | 91b93a69cd36bef60c2b322f9cc0e3816361b17f (patch) | |
| tree | fff7bcff100f0a1b39c8a209d799c7a45ffea6a6 | |
| parent | after some discussion with others, use an en-dash (\(en) instead of (diff) | |
| download | wireguard-openbsd-91b93a69cd36bef60c2b322f9cc0e3816361b17f.tar.xz wireguard-openbsd-91b93a69cd36bef60c2b322f9cc0e3816361b17f.zip | |
Since tmux doesn't actually need ncurses, use -lcurses/curses.h
instead. Pointed out by millert a while ago.
| -rw-r--r-- | usr.bin/tmux/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tty-term.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/tmux/Makefile b/usr.bin/tmux/Makefile index ddcc1479e99..252d6d1b56f 100644 --- a/usr.bin/tmux/Makefile +++ b/usr.bin/tmux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2009/07/13 17:47:46 nicm Exp $ +# $OpenBSD: Makefile,v 1.7 2009/07/14 06:30:45 nicm Exp $ PROG= tmux SRCS= attributes.c buffer-poll.c buffer.c cfg.c client-fn.c \ @@ -38,7 +38,7 @@ CDIAGFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations CDIAGFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare CDIAGFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align -LDADD= -lutil -lncurses +LDADD= -lutil -lcurses DPADD= ${LIBUTIL} .include <bsd.prog.mk> diff --git a/usr.bin/tmux/tty-term.c b/usr.bin/tmux/tty-term.c index c9f026f19e3..f86680b9ab7 100644 --- a/usr.bin/tmux/tty-term.c +++ b/usr.bin/tmux/tty-term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-term.c,v 1.2 2009/06/05 03:13:16 ray Exp $ */ +/* $OpenBSD: tty-term.c,v 1.3 2009/07/14 06:30:45 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -18,7 +18,7 @@ #include <sys/types.h> -#include <ncurses.h> +#include <curses.h> #include <string.h> #include <term.h> @@ -183,7 +183,7 @@ tty_term_find(char *name, int fd, char **cause) term->flags = 0; SLIST_INSERT_HEAD(&tty_terms, term, entry); - /* Set up ncurses terminal. */ + /* Set up curses terminal. */ if (setupterm(name, fd, &error) != OK) { switch (error) { case 0: @@ -237,7 +237,7 @@ tty_term_find(char *name, int fd, char **cause) } tty_term_quirks(term); - /* Delete ncurses data. */ + /* Delete curses data. */ del_curterm(cur_term); /* These are always required. */ @@ -358,7 +358,7 @@ tty_term_string(struct tty_term *term, enum tty_code_code code) return (term->codes[code].value.string); } -/* No vtparm. Fucking ncurses. */ +/* No vtparm. Fucking curses. */ const char * tty_term_string1(struct tty_term *term, enum tty_code_code code, int a) { |