8000 gh-108765: [TEST] Test combined Python.h changes by vstinner · Pull Request #108784 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-108765: [TEST] Test combined Python.h changes #108784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

gh-108765: [TEST] Test combined Python.h changes #108784

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12a842c
gh-108765: Python.h no longer includes <sys/time.h>
vstinner Sep 1, 2023
7f04dda
gh-108765: Python.h no longer includes <ieeefp.h>
vstinner Sep 1, 2023
1b43dc1
gh-108765: Remove old prototypes from pyport.h
vstinner Sep 1, 2023
6aede60
gh-108765: Python.h no longer includes <unistd.h>
vstinner Sep 1, 2023
0a43ccc
Fix mmapmodule.c
vstinner Sep 1, 2023
7531a55
Fix select module
vstinner Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix mmapmodule.c 
Cleanup also other <unistd.h> includes.
  • Loading branch information
@vstinner
vstinner committed Sep 1, 2023
commit 0a43cccc3f7b1d52b25645264dc1fbecb450d812
13 changes: 7 additions & 6 deletions Modules/_ctypes/malloc_closure.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
#ifndef Py_BUILD_CORE_BUILTIN
# define Py_BUILD_CORE_MODULE 1
#endif

#include <Python.h>
#include <ffi.h>
#ifdef MS_WIN32
#include <windows.h>
# include <windows.h>
#else
#include <sys/mman.h>
#include <unistd.h>
# if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
# define MAP_ANONYMOUS MAP_ANON
# endif
# include <sys/mman.h>
# include <unistd.h>
# if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
# define MAP_ANONYMOUS MAP_ANON
# endif
#endif
#include "ctypes.h"

Expand Down
4 changes: 2 additions & 2 deletions Modules/_posixsubprocess.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#include "pycore_pystate.h"
#include "pycore_signal.h" // _Py_RestoreSignals()
#if defined(HAVE_PIPE2) && !defined(_GNU_SOURCE)
# define _GNU_SOURCE
# define _GNU_SOURCE
#endif
#include <unistd.h>
#include <unistd.h> // close()
#include <fcntl.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Expand Down
3 changes: 0 additions & 3 deletions Modules/_testcapimodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
#include <float.h> // FLT_MAX
#include <signal.h>
#include <stddef.h> // offsetof()
#ifndef MS_WINDOWS
# include <unistd.h>
#endif

#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h> // W_STOPCODE
Expand Down
4 changes: 3 additions & 1 deletion Modules/mmapmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
#include "pycore_fileutils.h" // _Py_stat_struct

#include <stddef.h> // offsetof()
#include <unistd.h> // close()
#ifndef MS_WINDOWS
# include <unistd.h> // close()
#endif

// to support MS_WINDOWS_SYSTEM OpenFileMappingA / CreateFileMappingA
// need to be replaced with OpenFileMappingW / CreateFileMappingW
Expand Down
2 changes: 1 addition & 1 deletion Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ corresponding Unix manual entries for more information on calls.");
#endif

#ifdef HAVE_COPY_FILE_RANGE
# include <unistd.h>
# include <unistd.h> // copy_file_range()
#endif

#if !defined(CPU_ALLOC) && defined(HAVE_SCHED_SETAFFINITY)
Expand Down
1 change: 0 additions & 1 deletion Modules/pwdmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <pwd.h> // getpwuid()
#include <unistd.h> // sysconf()


#include "clinic/pwdmodule.c.h"
/*[clinic input]
module pwd
Expand Down
9 changes: 4 additions & 5 deletions Modules/resource.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

#include "Python.h"
#include <sys/resource.h>
#include <errno.h> // errno
#include <string.h>
#include <sys/resource.h> // getrusage()
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
# include <sys/time.h>
#endif
#include <time.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>

/* On some systems, these aren't in any header file.
Expand Down
2 changes: 1 addition & 1 deletion Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
# include <unistd.h>
#include <unistd.h> // close()

/* Headers needed for inet_ntoa() and inet_addr() */
# include <arpa/inet.h>
Expand Down
2 changes: 1 addition & 1 deletion Programs/_freeze_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#ifndef MS_WINDOWS
#include <unistd.h>
# include <unistd.h>
#endif

uint32_t _Py_next_func_version = 1;
Expand Down
6 changes: 3 additions & 3 deletions Python/dup2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* Return fd2 if all went well; return BADEXIT otherwise.
*/

#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h> // errno
#include <fcntl.h> // fcntl()
#include <unistd.h> // close()

#define BADEXIT -1

Expand Down
0