svn commit: r223289 - head/contrib/dialog
Jaakko Heinonen
jh at FreeBSD.org
Sun Jun 19 08:53:16 UTC 2011
Author: jh
Date: Sun Jun 19 08:53:16 2011
New Revision: 223289
URL: http://svn.freebsd.org/changeset/base/223289
Log:
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
Modified:
head/contrib/dialog/dialog.h
Modified: head/contrib/dialog/dialog.h
==============================================================================
--- head/contrib/dialog/dialog.h Sun Jun 19 08:34:10 2011 (r223288)
+++ head/contrib/dialog/dialog.h Sun Jun 19 08:53:16 2011 (r223289)
@@ -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>
More information about the svn-src-head
mailing list