From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 22 Nov 2002 16:12:57 +0000 (+0000)
Subject: Fix for #641455: curses module doesn't build on MacOSX. It turns out the
X-Git-Tag: v2.3c1~3297
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26897bf138df1b9b66ab61462347f000e8d67be1;p=thirdparty%2FPython%2Fcpython.git

Fix for #641455: curses module doesn't build on MacOSX. It turns out the
system headers have two declarations for wchar_t, with different guard macros.

Not sure whether this is a bugfix candidate, that depends on what changed in the
curses module.
---

diff --git a/Include/py_curses.h b/Include/py_curses.h
index 621dd4172000..9a89c50e7eb7 100644
--- a/Include/py_curses.h
+++ b/Include/py_curses.h
@@ -3,6 +3,15 @@
 #define Py_CURSES_H
 
 #ifdef HAVE_NCURSES_H
+#ifdef __APPLE__
+/*
+** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
+** against multiple definition of wchar_t.
+*/
+#ifdef	_BSD_WCHAR_T_DEFINED_
+#define _WCHAR_T
+#endif
+#endif
 #include <ncurses.h>
 #else
 #include <curses.h>