aboutsummaryrefslogtreecommitdiffhomepage
path: root/env.cpp
diff options
context:
space:
mode:
authorGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2014-12-07 16:41:15 +0800
committerGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2014-12-21 23:37:23 +0800
commita8059c5962ba5695b3622fe0cf7b5e2eb383db1f (patch)
tree919ff79f6edc0c7db28202d09549c4eec8d23e9c /env.cpp
parent381404c4f45c59d90524adfa3ee746bd608aea9d (diff)
Solaris build fixes: pick the right curses more of the time
Diffstat (limited to 'env.cpp')
-rw-r--r--env.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/env.cpp b/env.cpp
index 99678455..1e63a335 100644
--- a/env.cpp
+++ b/env.cpp
@@ -21,8 +21,13 @@
#if HAVE_NCURSES_H
#include <ncurses.h>
+#elif HAVE_NCURSES_CURSES_H
+#include <ncurses/curses.h>
#else
+// Solaris curses defines lots of unneeded macros which conflict with C++
+#define NOMACROS
#include <curses.h>
+#undef NOMACROS
#endif
#if HAVE_TERM_H