diff options
| author | jh <jh@FreeBSD.org> | 2011-06-19 08:53:16 +0000 |
|---|---|---|
| committer | jh <jh@FreeBSD.org> | 2011-06-19 08:53:16 +0000 |
| commit | bea80f7c3ca1c85c032cf7b12115e30c26e411e6 (patch) | |
| tree | 38a71fb8cabcb500b9eea95a0fb24892e3f95975 | |
| parent | 59ea8324d7e5550e0c6d00992c3200b8355e6aad (diff) | |
| download | FreeBSD-src-bea80f7c3ca1c85c032cf7b12115e30c26e411e6.zip FreeBSD-src-bea80f7c3ca1c85c032cf7b12115e30c26e411e6.tar.gz | |
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
| -rw-r--r-- | contrib/dialog/dialog.h | 7 |
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> |
