8000 gh-108765: Python.h no longer includes <unistd.h> · python/cpython@f2f1abe · GitHub
[go: up one dir, main page]
Skip to content

Commit f2f1abe

Browse files
vstinnervstinner
committed
gh-108765: Python.h no longer includes <unistd.h>
1 parent 4ba1809 commit f2f1abe

File tree

16 files changed

+55
-42
lines changed

16 files changed

+55
-42
lines changed

‎Doc/whatsnew/3.13.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,11 @@ Porting to Python 3.13
921921
also the ``HAVE_IEEEFP_H`` macro.
922922
(Contributed by Victor Stinner in :gh:`108765`.)
923923

924+
* ``Python.h`` no longer includes the ``<unistd.h>`` standard header file. If
925+
needed, it should now be included explicitly. For example, it provides the
926+
functions: ``close()``, ``getpagesize()``, ``getpid()`` and ``sysconf()``.
927+
(Contributed by Victor Stinner in :gh:`108765`.)
928+
924929
Deprecated
925930
----------
926931

‎Include/Python.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626
#ifdef HAVE_STDDEF_H
2727
# include <stddef.h> // size_t
2828
#endif
29-
#ifndef MS_WINDOWS
30-
# include <unistd.h> // sysconf()
29+
#ifdef HAVE_SYS_TYPES_H
30+
# include <sys/types.h> // ssize_t
3131
#endif
3232

33-
// errno.h, stdio.h, stdlib.h and string.h headers are no longer used by Python
34-
// headers, but kept for backward compatibility (no introduce new compiler
35-
// warnings). They are not included by the limited C API version 3.11 and
36-
// above.
33+
// errno.h, stdio.h, stdlib.h and string.h headers are no longer used by
34+
// Python, but kept for backward compatibility (avoid compiler warnings).
35+
// They are no longer included by limited C API version 3.11 and newer.
3736
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
3837
# include <errno.h> // errno
3938
# include <stdio.h> // FILE*

‎Misc/NEWS.d/next/C API/2023-09-01-21-10-29.gh-issue-108765.eeXtYF.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
``Python.h`` no longer includes the ``<unistd.h>`` standard header file. If
2+
needed, it should now be included explicitly. For example, it provides the
3+
functions: ``close()``, ``getpagesize()``, ``getpid()`` and ``sysconf()``.
4+
Patch by Victor Stinner.

‎Modules/_ctypes/malloc_closure.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
#ifndef Py_BUILD_CORE_BUILTIN
22
# define Py_BUILD_CORE_MODULE 1
33
#endif
4+
45
#include <Python.h>
56
#include <ffi.h>
67
#ifdef MS_WIN32
7-
#include <windows.h>
8+
# include <windows.h>
89
#else
9-
#include <sys/mman.h>
10-
#include <unistd.h>
11-
# if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
12-
# define MAP_ANONYMOUS MAP_ANON
13-
# endif
10+
# include <sys/mman.h>
11+
# include <unistd.h> // sysconf()
12+
# if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
13+
# define MAP_ANONYMOUS MAP_ANON
14+
# endif
1415
#endif
1516
#include "ctypes.h"
1617

‎Modules/_posixsubprocess.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@
88
#include "pycore_pystate.h"
99
#include "pycore_signal.h" // _Py_RestoreSignals()
1010
#if defined(HAVE_PIPE2) && !defined(_GNU_SOURCE)
11-
# define _GNU_SOURCE
11+
# define _GNU_SOURCE
1212
#endif
13-
#include <unistd.h>
14-
#include <fcntl.h>
13+
#include <unistd.h> // close()
14+
#include <fcntl.h> // fcntl()
1515
#ifdef HAVE_SYS_TYPES_H
16-
#include <sys/types.h>
16+
# include <sys/types.h>
1717
#endif
1818
#if defined(HAVE_SYS_STAT_H)
19-
#include <sys/stat.h>
19+
# include <sys/stat.h> // stat()
2020
#endif
2121
#ifdef HAVE_SYS_SYSCALL_H
22-
#include <sys/syscall.h>
22+
# include <sys/syscall.h>
2323
#endif
2424
#if defined(HAVE_SYS_RESOURCE_H)
25-
#include <sys/resource.h>
25+
# include <sys/resource.h>
2626
#endif
2727
#ifdef HAVE_DIRENT_H
28-
#include <dirent.h>
28+
# include <dirent.h> // opendir()
29+
#endif
30+
#if defined(HAVE_SETGROUPS)
31+
# include <grp.h> // setgroups()
2932
#endif
30-
#ifdef HAVE_GRP_H
31-
#include <grp.h>
32-
#endif /* HAVE_GRP_H */
3333

3434
#include "posixmodule.h"
3535

‎Modules/_testcapimodule.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
#include <float.h> // FLT_MAX
2525
#include <signal.h>
2626
#include <stddef.h> // offsetof()
27-
#ifndef MS_WINDOWS
28-
# include <unistd.h>
29-
#endif
3027

3128
#ifdef HAVE_SYS_WAIT_H
3229
# include <sys/wait.h> // W_STOPCODE

‎Modules/grpmodule.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#include "Python.h"
55
#include "posixmodule.h"
66

7-
#include <grp.h>
7+
#include <grp.h> // getgrgid_r()
8+
#include <unistd.h> // sysconf()
89

910
#include "clinic/grpmodule.c.h"
1011
/*[clinic input]

‎Modules/mmapmodule.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
#include "pycore_fileutils.h" // _Py_stat_struct
2929

3030
#include <stddef.h> // offsetof()
31+
#ifndef MS_WINDOWS
32+
# include <unistd.h> // close()
33+
#endif
3134

3235
// to support MS_WINDOWS_SYSTEM OpenFileMappingA / CreateFileMappingA
3336
// need to be replaced with OpenFileMappingW / CreateFileMappingW

‎Modules/posixmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ corresponding Unix manual entries for more information on calls.");
286286
#endif
287287

288288
#ifdef HAVE_COPY_FILE_RANGE
289-
# include <unistd.h>
289+
# include <unistd.h> // copy_file_range()
290290
#endif
291291

292292
#if !defined(CPU_ALLOC) && defined(HAVE_SCHED_SETAFFINITY)

‎Modules/pwdmodule.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#include "Python.h"
55
#include "posixmodule.h"
66

7-
#include <pwd.h>
7+
#include <pwd.h> // getpwuid()
8+
#include <unistd.h> // sysconf()
89

910
#include "clinic/pwdmodule.c.h"
1011
/*[clinic input]

0 commit comments

Comments
 (0)
0