[Python-checkins] cpython: Fix build error in _curses module when not using libncursesw.
nadeem.vawda
python-checkins at python.org
Sun Jul 31 15:06:28 CEST 2011
http://hg.python.org/cpython/rev/d98b5e0f0862
changeset: 71656:d98b5e0f0862
user: Nadeem Vawda <nadeem.vawda at gmail.com>
date: Sun Jul 31 15:01:11 2011 +0200
summary:
Fix build error in _curses module when not using libncursesw.
Code extracted from Victor Stinner's patch for issue #12567.
files:
Modules/_cursesmodule.c | 4 ++++
setup.py | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -906,6 +906,7 @@
}
}
+#ifdef HAVE_NCURSESW
static PyObject *
PyCursesWindow_Get_WCh(PyCursesWindowObject *self, PyObject *args)
{
@@ -937,6 +938,7 @@
}
return PyLong_FromLong(rtn);
}
+#endif
static PyObject *
PyCursesWindow_GetStr(PyCursesWindowObject *self, PyObject *args)
@@ -1636,7 +1638,9 @@
{"getbkgd", (PyCFunction)PyCursesWindow_GetBkgd, METH_NOARGS},
{"getch", (PyCFunction)PyCursesWindow_GetCh, METH_VARARGS},
{"getkey", (PyCFunction)PyCursesWindow_GetKey, METH_VARARGS},
+#ifdef HAVE_NCURSESW
{"get_wch", (PyCFunction)PyCursesWindow_Get_WCh, METH_VARARGS},
+#endif
{"getmaxyx", (PyCFunction)PyCursesWindow_getmaxyx, METH_NOARGS},
{"getparyx", (PyCFunction)PyCursesWindow_getparyx, METH_NOARGS},
{"getstr", (PyCFunction)PyCursesWindow_GetStr, METH_VARARGS},
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1161,6 +1161,10 @@
else:
missing.extend(['nis', 'resource', 'termios'])
+ curses_defines = []
+ if curses_library == 'ncursesw':
+ curses_defines.append(('HAVE_NCURSESW', '1'))
+
# Curses support, requiring the System V version of curses, often
# provided by the ncurses library.
panel_library = 'panel'
@@ -1171,6 +1175,7 @@
panel_library = 'panelw'
curses_libs = [curses_library]
exts.append( Extension('_curses', ['_cursesmodule.c'],
+ define_macros=curses_defines,
libraries = curses_libs) )
elif curses_library == 'curses' and platform != 'darwin':
# OSX has an old Berkeley curses, not good enough for
@@ -1183,6 +1188,7 @@
curses_libs = ['curses']
exts.append( Extension('_curses', ['_cursesmodule.c'],
+ define_macros=curses_defines,
libraries = curses_libs) )
else:
missing.append('_curses')
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list