summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2002-11-22 16:12:57 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2002-11-22 16:12:57 (GMT)
commit26897bf138df1b9b66ab61462347f000e8d67be1 (patch)
treed171b1705b80f2c20920ce6ca48ad34139acb988
parent44f602dd3b452bbacd3c85b1e5f9873c892b46e3 (diff)
downloadcpython-26897bf138df1b9b66ab61462347f000e8d67be1.zip
cpython-26897bf138df1b9b66ab61462347f000e8d67be1.tar.gz
cpython-26897bf138df1b9b66ab61462347f000e8d67be1.tar.bz2
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.
-rw-r--r--Include/py_curses.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/Include/py_curses.h b/Include/py_curses.h
index 621dd41..9a89c50 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>