[Python-checkins] bpo-16135: Cleanup: Code rot left over from OS/2 support (GH-4147)

Victor Stinner webhook-mailer at python.org
Fri Oct 27 08:27:09 EDT 2017


https://github.com/python/cpython/commit/03eb11f0b354751248b427455b89e9340cfd2b47
commit: 03eb11f0b354751248b427455b89e9340cfd2b47
branch: master
author: Erik Bray <erik.m.bray at gmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-27T05:27:06-07:00
summary:

bpo-16135: Cleanup: Code rot left over from OS/2 support (GH-4147)

Remove dangling references to PYCC_VACPP that are not relelvant
since removal of OS/2 support.

files:
M Modules/posixmodule.c
M Modules/socketmodule.c

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 661fa1312ad..de32327b304 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -210,15 +210,11 @@ extern char        *ctermid_r(char *);
 #endif
 
 #ifndef HAVE_UNISTD_H
-#if defined(PYCC_VACPP)
-extern int mkdir(char *);
-#else
 #if ( defined(__WATCOMC__) || defined(_MSC_VER) ) && !defined(__QNX__)
 extern int mkdir(const char *);
 #else
 extern int mkdir(const char *, mode_t);
 #endif
-#endif
 #if defined(__IBMC__) || defined(__IBMCPP__)
 extern int chdir(char *);
 extern int rmdir(char *);
@@ -3886,7 +3882,7 @@ os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd)
         result = mkdirat(dir_fd, path->narrow, mode);
     else
 #endif
-#if ( defined(__WATCOMC__) || defined(PYCC_VACPP) ) && !defined(__QNX__)
+#if defined(__WATCOMC__) && !defined(__QNX__)
         result = mkdir(path->narrow);
 #else
         result = mkdir(path->narrow, mode);
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 6f114efe31e..643148e53f9 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -226,13 +226,6 @@ if_indextoname(index) -- return the corresponding interface name\n\
 # include "pythread.h"
 #endif
 
-#if defined(PYCC_VACPP)
-# include <types.h>
-# include <io.h>
-# include <sys/ioctl.h>
-# include <utils.h>
-# include <ctype.h>
-#endif
 
 #if defined(__APPLE__) || defined(__CYGWIN__)
 # include <sys/ioctl.h>



More information about the Python-checkins mailing list