[Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.246,2.247 dynload_beos.c,2.6,2.7 frozenmain.c,2.26,2.27 import.c,2.192,2.193 pythonrun.c,2.153,2.154 sysmodule.c,2.98,2.99 thread.c,2.39,2.40 thread_solaris.h,2.16,2.17

[Martin v. L?wis]

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv8438/Python

Modified Files:
	bltinmodule.c dynload_beos.c frozenmain.c import.c pythonrun.c 
	sysmodule.c thread.c thread_solaris.h 
Log Message:
Include <unistd.h> in Python.h. Fixes #500924.


Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.246
retrieving revision 2.247
diff -C2 -d -r2.246 -r2.247
*** bltinmodule.c	2001/12/13 19:51:51	2.246
--- bltinmodule.c	2002/01/12 11:05:09	2.247
***************
*** 10,17 ****
  #include <ctype.h>
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef RISCOS
  #include "unixstuff.h"
--- 10,13 ----

Index: dynload_beos.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/dynload_beos.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** dynload_beos.c	2001/11/28 20:37:25	2.6
--- dynload_beos.c	2002/01/12 11:05:09	2.7
***************
*** 5,9 ****
  #include <kernel/OS.h>
  #include <stdlib.h>
- #include <unistd.h>
  
  #include "Python.h"
--- 5,8 ----

Index: frozenmain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/frozenmain.c,v
retrieving revision 2.26
retrieving revision 2.27
diff -C2 -d -r2.26 -r2.27
*** frozenmain.c	2001/07/23 16:30:27	2.26
--- frozenmain.c	2002/01/12 11:05:10	2.27
***************
*** 10,22 ****
  #endif
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h> /* For isatty() */
- #endif
- 
- /* For isatty()'s proto. - [cjh] */
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  /* Main program */
  
--- 10,13 ----

Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.192
retrieving revision 2.193
diff -C2 -d -r2.192 -r2.193
*** import.c	2001/11/18 04:06:29	2.192
--- import.c	2002/01/12 11:05:10	2.193
***************
*** 16,23 ****
  #endif
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
--- 16,19 ----

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.153
retrieving revision 2.154
diff -C2 -d -r2.153 -r2.154
*** pythonrun.c	2001/12/07 15:35:35	2.153
--- pythonrun.c	2002/01/12 11:05:11	2.154
***************
*** 14,21 ****
  #include "marshal.h"
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef HAVE_SIGNAL_H
  #include <signal.h>
--- 14,17 ----

Index: sysmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v
retrieving revision 2.98
retrieving revision 2.99
diff -C2 -d -r2.98 -r2.99
*** sysmodule.c	2001/12/03 00:43:33	2.98
--- sysmodule.c	2002/01/12 11:05:11	2.99
***************
*** 21,28 ****
  #include "osdefs.h"
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef MS_COREDLL
  extern void *PyWin_DLLhModule;
--- 21,24 ----

Index: thread.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/thread.c,v
retrieving revision 2.39
retrieving revision 2.40
diff -C2 -d -r2.39 -r2.40
*** thread.c	2001/10/16 21:13:49	2.39
--- thread.c	2002/01/12 11:05:11	2.40
***************
*** 6,10 ****
     Stuff shared by all thread_*.h files is collected here. */
  
! #include "pyconfig.h"
  
  /* pyconfig.h may or may not define DL_IMPORT */
--- 6,10 ----
     Stuff shared by all thread_*.h files is collected here. */
  
! #include "Python.h"
  
  /* pyconfig.h may or may not define DL_IMPORT */
***************
*** 23,30 ****
  extern char *getenv(const char *);
  #endif
- #endif
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
  #endif
  
--- 23,26 ----

Index: thread_solaris.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/thread_solaris.h,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** thread_solaris.h	2001/10/16 21:13:49	2.16
--- thread_solaris.h	2002/01/12 11:05:12	2.17
***************
*** 2,6 ****
  #include <stdlib.h>
  #include <stdio.h>
- #include <unistd.h>
  #include <errno.h>
  #include </usr/include/thread.h>
--- 2,5 ----