[Python-checkins] CVS: python/dist/src/Modules _hotshot.c,1.11,1.11.6.1 bsddbmodule.c,1.30,1.30.6.1 fcntlmodule.c,2.31.18.1,2.31.18.2 getpath.c,1.40,1.40.6.1 linuxaudiodev.c,2.16,2.16.6.1 main.c,1.61,1.61.6.1 mmapmodule.c,2.35,2.35.6.1 posixmodule.c,2.216.4.1,2.216.4.2 readline.c,2.41,2.41.6.1 resource.c,2.19,2.19.12.1 rgbimgmodule.c,2.22,2.22.26.1 selectmodule.c,2.59,2.59.6.1 sgimodule.c,1.16,1.16.26.1 signalmodule.c,2.60,2.60.10.1 socketmodule.c,1.200.6.1,1.200.6.2 sunaudiodev.c,1.26,1.26.6.1 termios.c,2.31,2.31.18.1 timemodule.c,2.118,2.118.6.1

Martin v. L?wis loewis@users.sourceforge.net
Sat, 12 Jan 2002 03:13:26 -0800


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

Modified Files:
      Tag: release22-maint
	_hotshot.c bsddbmodule.c fcntlmodule.c getpath.c 
	linuxaudiodev.c main.c mmapmodule.c posixmodule.c readline.c 
	resource.c rgbimgmodule.c selectmodule.c sgimodule.c 
	signalmodule.c socketmodule.c sunaudiodev.c termios.c 
	timemodule.c 
Log Message:
Include <unistd.h> in Python.h. Fixes #500924.


Index: _hotshot.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_hotshot.c,v
retrieving revision 1.11
retrieving revision 1.11.6.1
diff -C2 -d -r1.11 -r1.11.6.1
*** _hotshot.c	2001/12/04 21:40:53	1.11
--- _hotshot.c	2002/01/12 11:13:23	1.11.6.1
***************
*** 9,16 ****
  #include "structmember.h"
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  /*
   * Which timer to use should be made more configurable, but that should not
--- 9,12 ----

Index: bsddbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.30
retrieving revision 1.30.6.1
diff -C2 -d -r1.30 -r1.30.6.1
*** bsddbmodule.c	2001/12/08 18:02:55	1.30
--- bsddbmodule.c	2002/01/12 11:13:23	1.30.6.1
***************
*** 19,26 ****
  #endif
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #include <sys/types.h>
  #include <sys/stat.h>
--- 19,22 ----

Index: fcntlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/fcntlmodule.c,v
retrieving revision 2.31.18.1
retrieving revision 2.31.18.2
diff -C2 -d -r2.31.18.1 -r2.31.18.2
*** fcntlmodule.c	2001/12/28 21:09:23	2.31.18.1
--- fcntlmodule.c	2002/01/12 11:13:23	2.31.18.2
***************
*** 4,11 ****
  #include "Python.h"
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef HAVE_SYS_FILE_H
  #include <sys/file.h>
--- 4,7 ----

Index: getpath.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/getpath.c,v
retrieving revision 1.40
retrieving revision 1.40.6.1
diff -C2 -d -r1.40 -r1.40.6.1
*** getpath.c	2001/12/02 23:56:28	1.40
--- getpath.c	2002/01/12 11:13:23	1.40.6.1
***************
*** 7,14 ****
  #include <string.h>
  
- #if HAVE_UNISTD_H
- #include <unistd.h>
- #endif /* HAVE_UNISTD_H */
- 
  #ifdef WITH_NEXT_FRAMEWORK
  #include <mach-o/dyld.h>
--- 7,10 ----

Index: linuxaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/linuxaudiodev.c,v
retrieving revision 2.16
retrieving revision 2.16.6.1
diff -C2 -d -r2.16 -r2.16.6.1
*** linuxaudiodev.c	2001/12/08 18:02:57	2.16
--- linuxaudiodev.c	2002/01/12 11:13:23	2.16.6.1
***************
*** 17,24 ****
  #include "structmember.h"
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
--- 17,20 ----

Index: main.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
retrieving revision 1.61
retrieving revision 1.61.6.1
diff -C2 -d -r1.61 -r1.61.6.1
*** main.c	2001/12/06 06:23:25	1.61
--- main.c	2002/01/12 11:13:23	1.61.6.1
***************
*** 5,12 ****
  #include "compile.h" /* For CO_FUTURE_DIVISION */
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef MS_WINDOWS
  #include <fcntl.h>
--- 5,8 ----

Index: mmapmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mmapmodule.c,v
retrieving revision 2.35
retrieving revision 2.35.6.1
diff -C2 -d -r2.35 -r2.35.6.1
*** mmapmodule.c	2001/12/08 18:02:57	2.35
--- mmapmodule.c	2002/01/12 11:13:23	2.35.6.1
***************
*** 37,41 ****
  
  #ifdef UNIX
- #include <unistd.h>
  #include <sys/mman.h>
  #include <sys/stat.h>
--- 37,40 ----

Index: posixmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.216.4.1
retrieving revision 2.216.4.2
diff -C2 -d -r2.216.4.1 -r2.216.4.2
*** posixmodule.c	2001/12/28 10:24:44	2.216.4.1
--- posixmodule.c	2002/01/12 11:13:23	2.216.4.2
***************
*** 47,55 ****
  #endif
  
- /* pick up declaration of confstr on some systems? */
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif /* HAVE_UNISTD_H */
- 
  /* Various compilers have only certain posix functions */
  /* XXX Gosh I wish these were all moved into pyconfig.h */
--- 47,50 ----
***************
*** 112,119 ****
  
  #ifndef _MSC_VER
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
  
  #if defined(sun) && !defined(__SVR4)
--- 107,110 ----

Index: readline.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/readline.c,v
retrieving revision 2.41
retrieving revision 2.41.6.1
diff -C2 -d -r2.41 -r2.41.6.1
*** readline.c	2001/11/28 20:27:42	2.41
--- readline.c	2002/01/12 11:13:23	2.41.6.1
***************
*** 13,20 ****
  #include <errno.h>
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h> /* For isatty() */
- #endif
- 
  /* GNU readline definitions */
  #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
--- 13,16 ----

Index: resource.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/resource.c,v
retrieving revision 2.19
retrieving revision 2.19.12.1
diff -C2 -d -r2.19 -r2.19.12.1
*** resource.c	2001/09/17 16:19:16	2.19
--- resource.c	2002/01/12 11:13:23	2.19.12.1
***************
*** 3,7 ****
  #include <sys/resource.h>
  #include <sys/time.h>
- #include <unistd.h>
  #include <string.h>
  #include <errno.h>
--- 3,6 ----

Index: rgbimgmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/rgbimgmodule.c,v
retrieving revision 2.22
retrieving revision 2.22.26.1
diff -C2 -d -r2.22 -r2.22.26.1
*** rgbimgmodule.c	2000/07/21 06:00:07	2.22
--- rgbimgmodule.c	2002/01/12 11:13:23	2.22.26.1
***************
*** 29,35 ****
  #endif
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
  #include <string.h>
  
--- 29,32 ----

Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.59
retrieving revision 2.59.6.1
diff -C2 -d -r2.59 -r2.59.6.1
*** selectmodule.c	2001/12/08 18:02:58	2.59
--- selectmodule.c	2002/01/12 11:13:23	2.59.6.1
***************
*** 19,25 ****
  #endif 
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
  #if defined(HAVE_POLL_H)
  #include <poll.h>
--- 19,22 ----

Index: sgimodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/sgimodule.c,v
retrieving revision 1.16
retrieving revision 1.16.26.1
diff -C2 -d -r1.16 -r1.16.26.1
*** sgimodule.c	2000/09/01 23:29:27	1.16
--- sgimodule.c	2002/01/12 11:13:23	1.16.26.1
***************
*** 6,10 ****
  #include <sys/types.h>
  #include <sys/stat.h>
- #include <unistd.h>
  #include <fcntl.h>
  
--- 6,9 ----

Index: signalmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/signalmodule.c,v
retrieving revision 2.60
retrieving revision 2.60.10.1
diff -C2 -d -r2.60 -r2.60.10.1
*** signalmodule.c	2001/10/01 17:58:40	2.60
--- signalmodule.c	2002/01/12 11:13:23	2.60.10.1
***************
*** 11,18 ****
  #endif
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #include <signal.h>
  
--- 11,14 ----

Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.200.6.1
retrieving revision 1.200.6.2
diff -C2 -d -r1.200.6.1 -r1.200.6.2
*** socketmodule.c	2001/12/28 10:12:44	1.200.6.1
--- socketmodule.c	2002/01/12 11:13:23	1.200.6.2
***************
*** 116,123 ****
  #endif
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #if defined(PYCC_VACPP)
  #include <types.h>
--- 116,119 ----

Index: sunaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/sunaudiodev.c,v
retrieving revision 1.26
retrieving revision 1.26.6.1
diff -C2 -d -r1.26 -r1.26.6.1
*** sunaudiodev.c	2001/12/08 18:02:58	1.26
--- sunaudiodev.c	2002/01/12 11:13:23	1.26.6.1
***************
*** 9,16 ****
  #endif
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
--- 9,12 ----

Index: termios.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/termios.c,v
retrieving revision 2.31
retrieving revision 2.31.18.1
diff -C2 -d -r2.31 -r2.31.18.1
*** termios.c	2001/06/15 12:05:44	2.31
--- termios.c	2002/01/12 11:13:24	2.31.18.1
***************
*** 13,20 ****
  #include <sys/ioctl.h>
  
- #ifdef __BEOS__
- #include <unistd.h>
- #endif
- 
  /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
   * MDTR, MRI, and MRTS (appearantly used internally by some things
--- 13,16 ----

Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.118
retrieving revision 2.118.6.1
diff -C2 -d -r2.118 -r2.118.6.1
*** timemodule.c	2001/12/08 18:02:58	2.118
--- timemodule.c	2002/01/12 11:13:24	2.118.6.1
***************
*** 25,32 ****
  #endif
  
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
  #ifdef HAVE_FTIME
  #include <sys/timeb.h>
--- 25,28 ----