Fix build error in _curses module when not using libncursesw.

nvawda · nvawda · commit 9e2e99097cee · 2011-07-31T15:01:11.000+02:00
Code extracted from Victor Stinner's patch for issue #12567.
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -906,6 +906,7 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args)
     }
 }
 
+#ifdef HAVE_NCURSESW
 static PyObject *
 PyCursesWindow_Get_WCh(PyCursesWindowObject *self, PyObject *args)
 {
@@ -937,6 +938,7 @@ PyCursesWindow_Get_WCh(PyCursesWindowObject *self, PyObject *args)
     }
     return PyLong_FromLong(rtn);
 }
+#endif
 
 static PyObject *
 PyCursesWindow_GetStr(PyCursesWindowObject *self, PyObject *args)
@@ -1636,7 +1638,9 @@ static PyMethodDef PyCursesWindow_Methods[] = {
     {"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
@@ -1161,6 +1161,10 @@ class db_found(Exception): pass
         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 @@ class db_found(Exception): pass
                 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 @@ class db_found(Exception): pass
                 curses_libs = ['curses']
 
             exts.append( Extension('_curses', ['_cursesmodule.c'],
+                                   define_macros=curses_defines,
                                    libraries = curses_libs) )
         else:
             missing.append('_curses')

Original file line number	Diff line number	Diff line change
`@@ -906,6 +906,7 @@ PyCursesWindow_GetKey(PyCursesWindowObject self, PyObject args)`
`906`	`906`	`}`
`907`	`907`	`}`
`908`	`908`
	`909`	`+#ifdef HAVE_NCURSESW`
`909`	`910`	`static PyObject *`
`910`	`911`	`PyCursesWindow_Get_WCh(PyCursesWindowObject self, PyObject args)`
`911`	`912`	`{`
`@@ -937,6 +938,7 @@ PyCursesWindow_Get_WCh(PyCursesWindowObject self, PyObject args)`
`937`	`938`	`}`
`938`	`939`	`return PyLong_FromLong(rtn);`
`939`	`940`	`}`
	`941`	`+#endif`
`940`	`942`
`941`	`943`	`static PyObject *`
`942`	`944`	`PyCursesWindow_GetStr(PyCursesWindowObject self, PyObject args)`
`@@ -1636,7 +1638,9 @@ static PyMethodDef PyCursesWindow_Methods[] = {`
`1636`	`1638`	`{"getbkgd", (PyCFunction)PyCursesWindow_GetBkgd, METH_NOARGS},`
`1637`	`1639`	`{"getch", (PyCFunction)PyCursesWindow_GetCh, METH_VARARGS},`
`1638`	`1640`	`{"getkey", (PyCFunction)PyCursesWindow_GetKey, METH_VARARGS},`
	`1641`	`+#ifdef HAVE_NCURSESW`
`1639`	`1642`	`{"get_wch", (PyCFunction)PyCursesWindow_Get_WCh, METH_VARARGS},`
	`1643`	`+#endif`
`1640`	`1644`	`{"getmaxyx", (PyCFunction)PyCursesWindow_getmaxyx, METH_NOARGS},`
`1641`	`1645`	`{"getparyx", (PyCFunction)PyCursesWindow_getparyx, METH_NOARGS},`
`1642`	`1646`	`{"getstr", (PyCFunction)PyCursesWindow_GetStr, METH_VARARGS},`