diff options
| author | Victor Stinner <vstinner@python.org> | 2020-10-29 14:16:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-29 14:16:23 (GMT) |
| commit | 5776663675b48f011d428a5874cc3c79d1deb59e (patch) | |
| tree | 13df320ed9473e63a92b8eed64a4d67c58f7d089 /Modules | |
| parent | 350526105fa9b131d8b941ae753378b741dabb2f (diff) | |
| download | cpython-5776663675b48f011d428a5874cc3c79d1deb59e.zip cpython-5776663675b48f011d428a5874cc3c79d1deb59e.tar.gz cpython-5776663675b48f011d428a5874cc3c79d1deb59e.tar.bz2 | |
bpo-42029: Remove IRIX code (GH-23023)
IRIX code was slowy removed in Python 2.4 (--with-sgi-dl), Python 3.3
(Irix threads), and Python 3.7.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/posixmodule.c | 7 | ||||
| -rw-r--r-- | Modules/resource.c | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index ccd64d6..203f985 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -6763,12 +6763,11 @@ error: /* AIX uses /dev/ptc but is otherwise the same as /dev/ptmx */ -/* IRIX has both /dev/ptc and /dev/ptmx, use ptmx */ #if defined(HAVE_DEV_PTC) && !defined(HAVE_DEV_PTMX) -#define DEV_PTY_FILE "/dev/ptc" -#define HAVE_DEV_PTMX +# define DEV_PTY_FILE "/dev/ptc" +# define HAVE_DEV_PTMX #else -#define DEV_PTY_FILE "/dev/ptmx" +# define DEV_PTY_FILE "/dev/ptmx" #endif #if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX) diff --git a/Modules/resource.c b/Modules/resource.c index ddbf80b..4f5dcf8 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -313,13 +313,10 @@ resource_getpagesize_impl(PyObject *module) long pagesize = 0; #if defined(HAVE_GETPAGESIZE) pagesize = getpagesize(); -#elif defined(HAVE_SYSCONF) -#if defined(_SC_PAGE_SIZE) +#elif defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE) pagesize = sysconf(_SC_PAGE_SIZE); #else - /* Irix 5.3 has _SC_PAGESIZE, but not _SC_PAGE_SIZE */ - pagesize = sysconf(_SC_PAGESIZE); -#endif +# error "unsupported platform: resource.getpagesize()" #endif return pagesize; } |