summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-09-06 21:23:05 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-09-06 21:23:05 (GMT)
commit02a9ce3edb32938b52dce6374341d03ef258bdf7 (patch)
treeaa9d6378b823a71cedb77f2ee907bb951520e919
parent74e010aafb7e3915fa3959f9a5ab0b3e7948a7d1 (diff)
downloadcpython-02a9ce3edb32938b52dce6374341d03ef258bdf7.zip
cpython-02a9ce3edb32938b52dce6374341d03ef258bdf7.tar.gz
cpython-02a9ce3edb32938b52dce6374341d03ef258bdf7.tar.bz2
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. ........
-rw-r--r--Include/py_curses.h7
-rw-r--r--Misc/NEWS2
2 files changed, 8 insertions, 1 deletions
diff --git a/Include/py_curses.h b/Include/py_curses.h
index f38f765..e4c0a6e 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 80ac82b..3522fc8 100644
--- 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.