summaryrefslogtreecommitdiffstats
path: root/contrib/dialog/dialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/dialog/dialog.h')
-rw-r--r--contrib/dialog/dialog.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/dialog/dialog.h b/contrib/dialog/dialog.h
index e726573..ceeba45 100644
--- a/contrib/dialog/dialog.h
+++ b/contrib/dialog/dialog.h
@@ -1,5 +1,5 @@
/*
- * $Id: dialog.h,v 1.223 2011/03/02 10:04:09 tom Exp $
+ * $Id: dialog.h,v 1.224 2011/06/13 14:29:42 tom Exp $
*
* dialog.h -- common declarations for all dialog modules
*
@@ -44,7 +44,10 @@
#include <signal.h> /* fork() etc. */
#include <math.h> /* sqrt() */
-#undef ERR /* header conflict with Solaris xpg4 */
+/* header conflict with Solaris xpg4 versus <sys/regset.h> */
+#if defined(ERR) && (ERR == 13)
+#undef ERR
+#endif
#if defined(HAVE_NCURSESW_NCURSES_H)
#include <ncursesw/ncurses.h>
OpenPOWER on IntegriCloud