diff options
| author | brooks <brooks@FreeBSD.org> | 2014-05-15 16:44:25 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2014-05-15 16:44:25 +0000 |
| commit | 274f59a96f2fc906e0cec15a4d1acaeeb3b8eee5 (patch) | |
| tree | a7f4de34a03e6224cc5904f3b4f74de437f0859f /usr.bin/systat | |
| parent | 14cb90d9b6dc36cd3f273b2847581b8efd885155 (diff) | |
| download | FreeBSD-src-274f59a96f2fc906e0cec15a4d1acaeeb3b8eee5.zip FreeBSD-src-274f59a96f2fc906e0cec15a4d1acaeeb3b8eee5.tar.gz | |
Revert r261296. This removes the WITHOUT_NCURSESW option.
It was the wrong direction. We will instead remove use of the
non-wide-character supporting libncurses.
Diffstat (limited to 'usr.bin/systat')
| -rw-r--r-- | usr.bin/systat/Makefile | 13 | ||||
| -rw-r--r-- | usr.bin/systat/main.c | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index 8d024ff..1bb2da0 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -16,16 +16,7 @@ CFLAGS+= -DINET6 WARNS?= 0 -DPADD= ${LIBM} ${LIBDEVSTAT} ${LIBKVM} -LDADD= -lm -ldevstat -lkvm - -.if ${MK_NCURSESW} == "no" -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses -.else -CFLAGS+= -DUSE_WIDECHAR -DPADD+= ${LIBNCURSESW} -LDADD+= -lncursesw -.endif +DPADD= ${LIBNCURSESW} ${LIBM} ${LIBDEVSTAT} ${LIBKVM} +LDADD= -lncursesw -lm -ldevstat -lkvm .include <bsd.prog.mk> diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index e80dc61..e0e627a 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -141,11 +141,7 @@ main(int argc, char **argv) double t; struct cmdentry *cmd = NULL; -#ifdef USE_WIDECHAR (void) setlocale(LC_ALL, ""); -#else - (void) setlocale(LC_TIME, ""); -#endif SLIST_INIT(&commands); argc--, argv++; |
