gh-108765: Python.h no longer includes <unistd.h>

vstinner · vstinner · commit 6aede6048016 · 2023-09-01T21:16:43.000+02:00
diff --git a/Include/Python.h b/Include/Python.h
@@ -26,14 +26,13 @@
 #ifdef HAVE_STDDEF_H
 #  include <stddef.h>             // size_t
 #endif
-#ifndef MS_WINDOWS
-#  include <unistd.h>             // sysconf()
+#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>          // ssize_t
 #endif
 
-// errno.h, stdio.h, stdlib.h and string.h headers are no longer used by Python
-// headers, but kept for backward compatibility (no introduce new compiler
-// warnings). They are not included by the limited C API version 3.11 and
-// above.
+// errno.h, stdio.h, stdlib.h and string.h headers are no longer used by
+// Python, but kept for backward compatibility (avoid compiler warnings).
+// They are no longer included by limited C API version 3.11 and newer.
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
 #  include <errno.h>              // errno
 #  include <stdio.h>              // FILE*
diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
@@ -4,7 +4,8 @@
 #include "Python.h"
 #include "posixmodule.h"
 
-#include <grp.h>
+#include <grp.h>                  // getgrgid_r()
+#include <unistd.h>               // sysconf()
 
 #include "clinic/grpmodule.c.h"
 /*[clinic input]
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -28,6 +28,7 @@
 #include "pycore_fileutils.h"     // _Py_stat_struct
 
 #include <stddef.h>               // offsetof()
+#include <unistd.h>               // close()
 
 // to support MS_WINDOWS_SYSTEM OpenFileMappingA / CreateFileMappingA
 // need to be replaced with OpenFileMappingW / CreateFileMappingW
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
@@ -4,7 +4,9 @@
 #include "Python.h"
 #include "posixmodule.h"
 
-#include <pwd.h>
+#include <pwd.h>                  // getpwuid()
+#include <unistd.h>               // sysconf()
+
 
 #include "clinic/pwdmodule.c.h"
 /*[clinic input]
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
@@ -17,6 +17,7 @@
 #include "pycore_time.h"          // _PyTime_t
 
 #include <stddef.h>               // offsetof()
+#include <unistd.h>               // close()
 
 #ifdef HAVE_SYS_DEVPOLL_H
 #include <sys/resource.h>
