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

diff --git a/Include/py_curses.h b/Include/py_curses.h
index ae7b12b685c3699d5ea29c91ed5be9b3a069eb7c..a891c42be653535940cde30f593c6594c137ee1a 100644 (file)
--- 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 1b180fbaaf8a7b6f7c350a835603c98a08672379..8fd20c968fac3bf1ff08ce8544d304566bfaa425 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -169,6 +169,8 @@ Library
 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