From bea80f7c3ca1c85c032cf7b12115e30c26e411e6 Mon Sep 17 00:00:00 2001
From: jh <jh@FreeBSD.org>
Date: Sun, 19 Jun 2011 08:53:16 +0000
Subject: Don't #undef curses ERR in dialog.h. Otherwise, the macro will be
 unavailable if curses.h is included before dialog.h.

PR:		bin/156601
Obtained from:	Thomas E. Dickey (upstream maintainer)
Discussed with:	nwhitehorn
---
 contrib/dialog/dialog.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'contrib/dialog')

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>
-- 
cgit v1.1