summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-09-06 21:21:05 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-09-06 21:21:05 (GMT)
commit6b3f1ef190bc89c4fcc5dbfdc3ca1cc15d5e6acc (patch)
treee0632617c3c7fcabe007f867d260a179ac870e7c
parent752a2daf323572cbeaa6dec42a807fc421d577c3 (diff)
downloadcpython-6b3f1ef190bc89c4fcc5dbfdc3ca1cc15d5e6acc.zip
cpython-6b3f1ef190bc89c4fcc5dbfdc3ca1cc15d5e6acc.tar.gz
cpython-6b3f1ef190bc89c4fcc5dbfdc3ca1cc15d5e6acc.tar.bz2
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 def387d..94f4399 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1293,6 +1293,8 @@ C-API
Extension Modules
-----------------
+- Issue #6848: Fix curses module build failure on OS X 10.6.
+
- Fix a segfault in expat when given a specially crafted input lead to the
tokenizer not stopping.