From b55628f08756e936f46d047130c831b47fd51831 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 6 Sep 2009 21:26:46 +0000 Subject: Merged revisions 74696 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r74696 | mark.dickinson | 2009-09-06 22:24:55 +0100 (Sun, 06 Sep 2009) | 9 lines Merged revisions 74693 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74693 | mark.dickinson | 2009-09-06 22:21:05 +0100 (Sun, 06 Sep 2009) | 2 lines Issue #6848: Fix curses module build failure on OS X 10.6. ........ ................ --- Include/py_curses.h | 7 ++++++- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Include/py_curses.h b/Include/py_curses.h index ae7b12b..a891c42 100644 --- a/Include/py_curses.h +++ b/Include/py_curses.h @@ -10,7 +10,12 @@ #ifdef _BSD_WCHAR_T_DEFINED_ #define _WCHAR_T #endif -#endif + +/* the following define is necessary for OS X 10.6; without it, the + Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python + can't get at the WINDOW flags field. */ +#define NCURSES_OPAQUE 0 +#endif /* __APPLE__ */ #ifdef __FreeBSD__ /* diff --git a/Misc/NEWS b/Misc/NEWS index 7e64cc7..80ebfa1 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -125,6 +125,8 @@ syntax error. Extension Modules ----------------- +- Issue #6848: Fix curses module build failure on OS X 10.6. + - Fix a segfault in expat. - Issue #4509: array.array objects are no longer modified after an operation -- cgit v0.12