[Bug #1471938] Fix build problem on Solaris 8 by conditionalizing the use of mvwgetns...

diff --git a/Misc/NEWS b/Misc/NEWS
index 4644c8269753d5c02c7e39a57a11e0aef7103b73..e186646f8a931b29bafd034012cc97100efb9307 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,9 @@ Core and builtins
 Library
 -------
 
+- Bug #1471938: Fix curses module build problem on Solaris 8; patch by 
+  Paul Eggert.
+
 - Bug #978833: Really close underlying socket in _socketobject.close.
 
 - Bug #1459963: urllib and urllib2 now normalize HTTP header names correctly

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index f74cfd59ff505974b73ccddf438b62056b847a69..37a6a559e61e3dee4022c36e3d73fadffcdeecf3 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -43,7 +43,7 @@ unsupported functions:
        del_curterm delscreen dupwin inchnstr inchstr innstr keyok
        mcprint mvaddchnstr mvaddchstr mvchgat mvcur mvinchnstr
        mvinchstr mvinnstr mmvwaddchnstr mvwaddchstr mvwchgat
-       mvwgetnstr mvwinchnstr mvwinchstr mvwinnstr newterm
+       mvwinchnstr mvwinchstr mvwinnstr newterm
        restartterm ripoffline scr_dump
        scr_init scr_restore scr_set scrl set_curterm set_term setterm
        tgetent tgetflag tgetnum tgetstr tgoto timeout tputs
@@ -819,14 +819,17 @@ PyCursesWindow_GetStr(PyCursesWindowObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args,"ii;y,x",&y,&x))
       return NULL;
     Py_BEGIN_ALLOW_THREADS
+#ifdef STRICT_SYSV_CURSES
+    rtn2 = wmove(self->win,y,x)==ERR ? ERR : wgetnstr(self->win, rtn, 1023);
+#else
     rtn2 = mvwgetnstr(self->win,y,x,rtn, 1023);
+#endif
     Py_END_ALLOW_THREADS
     break;
   case 3:
     if (!PyArg_ParseTuple(args,"iii;y,x,n", &y, &x, &n))
       return NULL;
 #ifdef STRICT_SYSV_CURSES
- /* Untested */
     Py_BEGIN_ALLOW_THREADS
     rtn2 = wmove(self->win,y,x)==ERR ? ERR :
       wgetnstr(self->win, rtn, MIN(n, 1023));