Index: dist/src/Modules/posixmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.329
diff -c -r2.329 posixmodule.c
*** dist/src/Modules/posixmodule.c	13 Oct 2004 15:30:56 -0000	2.329
--- dist/src/Modules/posixmodule.c	25 Oct 2004 16:04:19 -0000
***************
*** 31,36 ****
--- 31,40 ----
  #define Py_UNICODE void
  #endif
  
+ #if defined(WIN32) && defined(__GNUC__)
+ #define MINGW
+ #endif
+ 
  #if defined(PYOS_OS2)
  #define  INCL_DOS
  #define  INCL_DOSERRORS
***************
*** 105,110 ****
--- 109,124 ----
  #define HAVE_CWAIT	1
  #define HAVE_FSYNC	1
  #define fsync _commit
+ #ifdef MINGW            /* MingW (cross-)compiler*/
+ #define HAVE_GETCWD     1
+ #define HAVE_SPAWNV	1
+ #define HAVE_EXECV      1
+ #define HAVE_PIPE       1
+ #define HAVE_POPEN      1
+ #define HAVE_SYSTEM	1
+ #define HAVE_CWAIT	1
+ #define HAVE_FSYNC	1
+ #define fsync _commit
  #else
  #if defined(PYOS_OS2) && defined(PYCC_GCC) || defined(__VMS)
  /* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */
***************
*** 131,142 ****
  #define HAVE_WAIT       1
  #define HAVE_TTYNAME	1
  #endif  /* PYOS_OS2 && PYCC_GCC && __VMS */
  #endif  /* _MSC_VER */
  #endif  /* __BORLANDC__ */
  #endif  /* ! __WATCOMC__ || __QNX__ */
  #endif /* ! __IBMC__ */
  
! #ifndef _MSC_VER
  
  #if defined(__sgi)&&_COMPILER_VERSION>=700
  /* declare ctermid_r if compiling with MIPSPro 7.x in ANSI C mode
--- 145,157 ----
  #define HAVE_WAIT       1
  #define HAVE_TTYNAME	1
  #endif  /* PYOS_OS2 && PYCC_GCC && __VMS */
+ #endif  /* MINGW */
  #endif  /* _MSC_VER */
  #endif  /* __BORLANDC__ */
  #endif  /* ! __WATCOMC__ || __QNX__ */
  #endif /* ! __IBMC__ */
  
! #if !defined(_MSC_VER) && !defined(MINGW)
  
  #if defined(__sgi)&&_COMPILER_VERSION>=700
  /* declare ctermid_r if compiling with MIPSPro 7.x in ANSI C mode
***************
*** 182,188 ****
  #endif /* HAVE_LSTAT */
  #endif /* !HAVE_UNISTD_H */
  
! #endif /* !_MSC_VER */
  
  #ifdef HAVE_UTIME_H
  #include <utime.h>
--- 197,203 ----
  #endif /* HAVE_LSTAT */
  #endif /* !HAVE_UNISTD_H */
  
! #endif /* !_MSC_VER && !MINGW */
  
  #ifdef HAVE_UTIME_H
  #include <utime.h>
***************
*** 227,233 ****
  #endif
  #endif
  
! #ifdef _MSC_VER
  #include <direct.h>
  #include <io.h>
  #include <process.h>
--- 242,248 ----
  #endif
  #endif
  
! #if defined(_MSC_VER) || defined(MINGW)
  #include <direct.h>
  #include <io.h>
  #include <process.h>
***************
*** 237,243 ****
  #include <shellapi.h>	/* for ShellExecute() */
  #define popen	_popen
  #define pclose	_pclose
! #endif /* _MSC_VER */
  
  #if defined(PYCC_VACPP) && defined(PYOS_OS2)
  #include <io.h>
--- 252,258 ----
  #include <shellapi.h>	/* for ShellExecute() */
  #define popen	_popen
  #define pclose	_pclose
! #endif /* _MSC_VER || MINGW */
  
  #if defined(PYCC_VACPP) && defined(PYOS_OS2)
  #include <io.h>
***************
*** 304,312 ****
  */
  #include <crt_externs.h>
  static char **environ;
! #elif !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) )
  extern char **environ;
! #endif /* !_MSC_VER */
  
  static PyObject *
  convertenviron(void)
--- 319,327 ----
  */
  #include <crt_externs.h>
  static char **environ;
! #elif !defined(_MSC_VER) && !defined(MINGW) && ( !defined(__WATCOMC__) || defined(__QNX__) )
  extern char **environ;
! #endif /* !_MSC_VER && ! MINGW */
  
  static PyObject *
  convertenviron(void)
***************
*** 1783,1789 ****
  	                      Py_FileSystemDefaultEncoding, &path, &mode))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
! #if ( defined(__WATCOMC__) || defined(_MSC_VER) || defined(PYCC_VACPP) ) && !defined(__QNX__)
  	res = mkdir(path);
  #else
  	res = mkdir(path, mode);
--- 1798,1804 ----
  	                      Py_FileSystemDefaultEncoding, &path, &mode))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
! #if ( defined(__WATCOMC__) || defined(_MSC_VER) || defined(MINGW) || defined(PYCC_VACPP) ) && !defined(__QNX__)
  	res = mkdir(path);
  #else
  	res = mkdir(path, mode);
***************
*** 7213,7219 ****
  }
  #endif
  
! #ifdef MS_WINDOWS
  
  PyDoc_STRVAR(win32_urandom__doc__,
  "urandom(n) -> str\n\n\
--- 7228,7234 ----
  }
  #endif
  
! #if defined(MS_WINDOWS) && !defined(MINGW)
  
  PyDoc_STRVAR(win32_urandom__doc__,
  "urandom(n) -> str\n\n\
***************
*** 7570,7576 ****
  #ifdef HAVE_GETLOADAVG
  	{"getloadavg",	posix_getloadavg, METH_NOARGS, posix_getloadavg__doc__},
  #endif
!  #ifdef MS_WINDOWS
   	{"urandom", win32_urandom, METH_VARARGS, win32_urandom__doc__},
   #endif
  	{NULL,		NULL}		 /* Sentinel */
--- 7585,7591 ----
  #ifdef HAVE_GETLOADAVG
  	{"getloadavg",	posix_getloadavg, METH_NOARGS, posix_getloadavg__doc__},
  #endif
!  #if defined(MS_WINDOWS) && !defined(MINGW)
   	{"urandom", win32_urandom, METH_VARARGS, win32_urandom__doc__},
   #endif
  	{NULL,		NULL}		 /* Sentinel */
***************
*** 7843,7849 ****
  }
  
  
! #if (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)) && !defined(__QNX__)
  #define INITFUNC initnt
  #define MODNAME "nt"
  
--- 7858,7864 ----
  }
  
  
! #if (defined(_MSC_VER) || defined(MINGW) || defined(__WATCOMC__) || defined(__BORLANDC__)) && !defined(__QNX__)
  #define INITFUNC initnt
  #define MODNAME "nt"