Updated Branches: refs/heads/master 6f6b24332 -> 11a9d2561
a better Solaris ncurses fix Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/11a9d256 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/11a9d256 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/11a9d256 Branch: refs/heads/master Commit: 11a9d256128bd8daa7934a3da8beb2e500d2610e Parents: 6f6b243 Author: James Peach <[email protected]> Authored: Tue May 7 13:31:19 2013 -0700 Committer: James Peach <[email protected]> Committed: Tue May 7 13:31:19 2013 -0700 ---------------------------------------------------------------------- tools/tstop/tstop.cc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/11a9d256/tools/tstop/tstop.cc ---------------------------------------------------------------------- diff --git a/tools/tstop/tstop.cc b/tools/tstop/tstop.cc index 6191636..37cca7f 100644 --- a/tools/tstop/tstop.cc +++ b/tools/tstop/tstop.cc @@ -32,6 +32,10 @@ #include <unistd.h> #include <getopt.h> +// At least on solaris, the default ncurses defines macros such as +// clear() that break stdlibc++. +#define NCURSES_NOMACROS + #if defined HAVE_NCURSESW_CURSES_H # include <ncursesw/curses.h> #elif defined HAVE_NCURSESW_H @@ -46,11 +50,6 @@ # error "SysV or X/Open-compatible Curses header file required" #endif -// Solaris curses #defines wclear, which breaks std::string::wclear(). -#ifdef wclear -#undef wclear -#endif - #include "stats.h" using namespace std;
