jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't #undef curses ERR in dialog.h. Otherwise, the macro will be

Browse Source 
unavailable if curses.h is included before dialog.h.

PR:		bin/156601
Obtained from:	Thomas E. Dickey (upstream maintainer)
Discussed with:	nwhitehorn
This commit is contained in:
Jaakko Heinonen 2011-06-19 08:53:16 +00:00
parent 842014b127
commit 43764a7ffa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=223289
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/dialog/dialog.h
View File

@ -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>