[Python-checkins] CVS: python/dist/src/Modules _cursesmodule.c,2.51.4.1,2.51.4.2 mpzmodule.c,2.36,2.36.6.1 pcremodule.c,2.25.8.1,2.25.8.2 regexpr.c,1.33.8.1,1.33.8.2 selectmodule.c,2.50.6.1,2.50.6.2

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv4678/descr/dist/src/Modules

Modified Files:
      Tag: descr-branch
	_cursesmodule.c mpzmodule.c pcremodule.c regexpr.c 
	selectmodule.c 
Log Message:
Merge trunk tag delta date2001-07-13 to date2001-07-15.


Index: _cursesmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_cursesmodule.c,v
retrieving revision 2.51.4.1
retrieving revision 2.51.4.2
diff -C2 -r2.51.4.1 -r2.51.4.2
*** _cursesmodule.c	2001/07/07 22:55:29	2.51.4.1
--- _cursesmodule.c	2001/07/15 20:26:55	2.51.4.2
***************
*** 2052,2056 ****
  {
    WINDOW *win;
!   int nlines, ncols, begin_y, begin_x;
  
    PyCursesInitialised
--- 2052,2056 ----
  {
    WINDOW *win;
!   int nlines, ncols, begin_y=0, begin_x=0;
  
    PyCursesInitialised
***************
*** 2060,2064 ****
      if (!PyArg_Parse(args,"(ii);nlines,ncols",&nlines,&ncols))
        return NULL;
-     win = newpad(nlines, ncols);
      break;
    case 4:
--- 2060,2063 ----
***************
*** 2066,2070 ****
  		   &nlines,&ncols,&begin_y,&begin_x))
        return NULL;
-     win = newwin(nlines,ncols,begin_y,begin_x);
      break;
    default:
--- 2065,2068 ----
***************
*** 2073,2076 ****
--- 2071,2075 ----
    }
  
+   win = newwin(nlines,ncols,begin_y,begin_x);
    if (win == NULL) {
      PyErr_SetString(PyCursesError, catchall_NULL);

Index: mpzmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.36
retrieving revision 2.36.6.1
diff -C2 -r2.36 -r2.36.6.1
*** mpzmodule.c	2001/02/12 16:48:13	2.36
--- mpzmodule.c	2001/07/15 20:26:55	2.36.6.1
***************
*** 13,17 ****
  #include "Python.h"
  
- #include <assert.h>
  #include <sys/types.h>		/* For size_t */
  
--- 13,16 ----

Index: pcremodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.25.8.1
retrieving revision 2.25.8.2
diff -C2 -r2.25.8.1 -r2.25.8.2
*** pcremodule.c	2001/07/07 22:55:29	2.25.8.1
--- pcremodule.c	2001/07/15 20:26:55	2.25.8.2
***************
*** 3,7 ****
  #include "Python.h"
  
- #include <assert.h>
  #ifndef Py_eval_input
  /* For Python 1.4, graminit.h has to be explicitly included */
--- 3,6 ----

Index: regexpr.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/regexpr.c,v
retrieving revision 1.33.8.1
retrieving revision 1.33.8.2
diff -C2 -r1.33.8.1 -r1.33.8.2
*** regexpr.c	2001/07/07 22:55:29	1.33.8.1
--- regexpr.c	2001/07/15 20:26:55	1.33.8.2
***************
*** 31,35 ****
  #include "Python.h"
  #include "regexpr.h"
- #include <assert.h>
  
  /* The original code blithely assumed that sizeof(short) == 2.  Not
--- 31,34 ----

Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.50.6.1
retrieving revision 2.50.6.2
diff -C2 -r2.50.6.1 -r2.50.6.2
*** selectmodule.c	2001/07/07 22:55:29	2.50.6.1
--- selectmodule.c	2001/07/15 20:26:55	2.50.6.2
***************
*** 22,27 ****
  #include <unistd.h>
  #endif
! #ifdef HAVE_POLL_H
  #include <poll.h>
  #endif
  
--- 22,29 ----
  #include <unistd.h>
  #endif
! #if defined(HAVE_POLL_H)
  #include <poll.h>
+ #elif defined(HAVE_SYS_POLL_H)
+ #include <sys/poll.h>
  #endif