From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 6 Sep 2009 21:23:05 +0000 (+0000)
Subject: Merged revisions 74693 via svnmerge from
X-Git-Tag: v2.6.3rc1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02a9ce3edb32938b52dce6374341d03ef258bdf7;p=python

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 f38f76543b..e4c0a6e2c5 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 80ac82b138..3522fc86ca 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.