[Python-checkins] r74697 - in python/branches/release31-maint: Include/py_curses.h Misc/NEWS

[mark.dickinson]

Author: mark.dickinson
Date: Sun Sep  6 23:26:46 2009
New Revision: 74697

Log:
Merged revisions 74696 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74696 | mark.dickinson | 2009-09-06 22:24:55 +0100 (Sun, 06 Sep 2009) | 9 lines
  
  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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Include/py_curses.h
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Include/py_curses.h
==============================================================================
--- python/branches/release31-maint/Include/py_curses.h	(original)
+++ python/branches/release31-maint/Include/py_curses.h	Sun Sep  6 23:26:46 2009
@@ -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__
 /*

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Sep  6 23:26:46 2009
@@ -125,6 +125,8 @@
 Extension Modules
 -----------------
 
+- Issue #6848: Fix curses module build failure on OS X 10.6.
+
 - Fix a segfault in expat.
 
 - Issue #4509: array.array objects are no longer modified after an operation