[Python-checkins] r72883 - in python/branches/release26-maint: Modules/posixmodule.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun May 24 14:17:07 2009
New Revision: 72883

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Modules/posixmodule.c

Modified: python/branches/release26-maint/Modules/posixmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/posixmodule.c	(original)
+++ python/branches/release26-maint/Modules/posixmodule.c	Sun May 24 14:17:07 2009
@@ -311,8 +311,7 @@
 #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 @@
 #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