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 f38f76543b150c25bdb9930178f42d06a9acfd1c..e4c0a6e2c5933158b8ea3bca80f7488b847df952 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 80ac82b13891b9fcb3d3564c57c7240f062fa0d5..3522fc86ca99bc7d87bf4364bdb1f491a9a35829 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -180,6 +180,8 @@ Library
 Extension Modules
 -----------------
 
+- Issue #6848: Fix curses module build failure on OS X 10.6.
+
 - Fix expat to not segfault with specially crafted input.
 
 - Issue #4873: Fix resource leaks in error cases of pwd and grp.