diff -r ref/_cursesmodule.c src/_cursesmodule.c
118,123d117
< /*  These prototypes are in <term.h>, but including this header 
<     #defines many common symbols (such as "lines") which breaks the 
<     curses module in other ways.  So the code will just specify 
<     explicit prototypes here. */
< extern int setupterm(char *,int,int *);
< #ifdef __sgi
125d118
< #endif
135a129,130
> #include <curspriv.h>
> 
805c800
<   if (self->win->_flags & _ISPAD)
---
>   if (self->win->_flags & _PAD)
1233c1228
<   if (self->win->_flags & _ISPAD) {
---
>   if (self->win->_flags & _PAD) {
1375c1370
<   if (self->win->_flags & _ISPAD) {
---
>   if (self->win->_flags & _PAD) {
1441c1436
<   if (self->win->_flags & _ISPAD)
---
>   if (self->win->_flags & _PAD)
1724c1719
<   return PyInt_FromLong((long) (n << 8));
---
>   return PyInt_FromLong(COLOR_PAIR (n));
2013c2008,2009
< 	int fd = -1;
---
> 	int  fd = -1;
> #ifndef WIN32
2014a2011
> #endif
2042a2040
> #ifndef _WIN32
2054a2053
> #endif
2085,2086c2084,2085
<   int lines;
<   int columns;
---
>   int lines_;
>   int columns_;
2091c2090
<   if (!PyArg_ParseTuple(args,"ii:is_term_resized", &lines, &columns))
---
>   if (!PyArg_ParseTuple(args,"ii:is_term_resized", &lines_, &columns_))
2093c2092
<   result = is_term_resized(lines, columns);
---
>   result = is_term_resized(lines_, columns_);
2377,2378c2376,2377
<   int lines;
<   int columns;
---
>   int lines_;
>   int columns_;
2383c2382
<   if (!PyArg_ParseTuple(args,"ii:resizeterm", &lines, &columns))
---
>   if (!PyArg_ParseTuple(args,"ii:resizeterm", &lines_, &columns_))
2386c2385
<   result = PyCursesCheckERR(resizeterm(lines, columns), "resizeterm");
---
>   result = PyCursesCheckERR(resizeterm(lines_, columns_), "resizeterm");
2400,2401c2399,2400
<   int lines;
<   int columns;
---
>   int lines_;
>   int columns_;
2407c2406
<   if (!PyArg_ParseTuple(args,"ii:resize_term", &lines, &columns))
---
>   if (!PyArg_ParseTuple(args,"ii:resize_term", &lines_, &columns_))
2410c2409
<   result = PyCursesCheckERR(resize_term(lines, columns), "resize_term");
---
>   result = PyCursesCheckERR(resize_term(lines_, columns_), "resize_term");