[Python-checkins] r74696 - in python/branches/py3k: Include/py_curses.h Misc/NEWS

Sun Sep 6 23:24:55 CEST 2009

Author: mark.dickinson
Date: Sun Sep 6 23:24:55 2009
New Revision: 74696
Log:
Merged revisions 74693 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r74693 | mark.dickinson | 2009年09月06日 22:21:05 +0100 (2009年9月06日) | 2 lines
 
 Issue #6848: Fix curses module build failure on OS X 10.6.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Include/py_curses.h
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Include/py_curses.h
==============================================================================

--- python/branches/py3k/Include/py_curses.h	(original)
+++ python/branches/py3k/Include/py_curses.h	Sun Sep 6 23:24:55 2009
@@ -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__
 /*
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Sep 6 23:24:55 2009
@@ -169,6 +169,8 @@
 Extension Modules
 -----------------
 
+- Issue #6848: Fix curses module build failure on OS X 10.6.
+
 - Fix a segfault that could be triggered by expat with specially formed input.
 
 - Issue #6561: '\d' in a regex now matches only characters with
