From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 24 May 2009 12:17:07 +0000 (+0000)
Subject: Merged revisions 72882 via svnmerge from
X-Git-Tag: v2.6.3rc1~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c95acb120243c4b9d4aafd2871f4250696eb7c9;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 72882 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72882 | antoine.pitrou | 2009-05-24 14:15:04 +0200 (dim., 24 mai 2009) | 3 lines

  Fix build under Windows
........
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index f943991202ed..eb8083f0eda5 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -311,8 +311,7 @@ extern int lstat(const char *, struct stat *);
 #endif /* UNION_WAIT */
 
 /* Issue #1983: pid_t can be longer than a C long on some systems */
-#ifdef SIZEOF_PID_T
-#if SIZEOF_PID_T == SIZEOF_INT
+#if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT
 #define PARSE_PID "i"
 #define PyLong_FromPid PyInt_FromLong
 #define PyLong_AsPid PyInt_AsLong
@@ -326,7 +325,6 @@ extern int lstat(const char *, struct stat *);
 #define PyLong_AsPid PyInt_AsLongLong
 #else
 #error "sizeof(pid_t) is neither sizeof(int), sizeof(long) or sizeof(long long)"
-#endif
 #endif /* SIZEOF_PID_T */
 
 /* Don't use the "_r" form if we don't need it (also, won't have a