#16135: Removal of OS/2 support (C code and Docs)

diff --git a/Include/osdefs.h b/Include/osdefs.h
index 90b430a635b76a4ed9319afbb6968f4eb132374d..ed88da122fe4f5496f125bbe26457df559aeec88 100644 (file)
--- a/Include/osdefs.h
+++ b/Include/osdefs.h
@@ -9,16 +9,10 @@ extern "C" {
 
 /* Mod by chrish: QNX has WATCOM, but isn't DOS */
 #if !defined(__QNX__)
-#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2)
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
-#define MAXPATHLEN 260
-#define SEP L'/'
-#define ALTSEP L'\\'
-#else
+#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__)
 #define SEP L'\\'
 #define ALTSEP L'/'
 #define MAXPATHLEN 256
-#endif
 #define DELIM L';'
 #endif
 #endif

diff --git a/Include/pyport.h b/Include/pyport.h
index eba34f9af222c6a20d7a34bbb22d423e238283e5..284e6da7470638d9f7002f8e139cd5811f881d1d 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -379,9 +379,6 @@ typedef size_t Py_uhash_t;
 #endif
 
 #ifdef HAVE_SYS_STAT_H
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
-#include <sys/types.h>
-#endif
 #include <sys/stat.h>
 #elif defined(HAVE_STAT_H)
 #include <stat.h>

diff --git a/PC/python.mk b/PC/python.mk
deleted file mode 100644 (file)
index a765106..0000000
--- a/PC/python.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-project : n:\python\python-1.5.1\pc\wat_os2\pyth_os2.exe n:\python\python-1.&\r
-5.1\pc\wat_dos\pyth_dos.exe .SYMBOLIC\r
-\r
-!include n:\python\python-1.5.1\pc\wat_os2\pyth_os2.mk1\r
-!include n:\python\python-1.5.1\pc\wat_dos\pyth_dos.mk1\r

diff --git a/PC/readme.txt b/PC/readme.txt
index fdc09abf9f8501761db43aa4f1fea8a606cd1fdf..60f231e513ef0de5ae9501910fae43893da5451f 100644 (file)
--- a/PC/readme.txt
+++ b/PC/readme.txt
@@ -79,19 +79,6 @@ Legacy support for older versions of Visual Studio
 The subdirectories VC6, VS7.1 and VS8.0 contain legacy support older
 versions of Microsoft Visual Studio. See PCbuild/readme.txt.
 
-EMX development tools for OS/2
-==============================
-
-See os2emx/readme.txt. This platform is maintained by Andrew MacIntyre.
-
-IBM VisualAge C/C++ for OS/2
-============================
-
-See os2vacpp/readme.txt.  This platform is supported by Jeff Rush.
-
-NOTE: Support for os2vacpp may be dropped in the near future. Please move
-      to EMX.
-
 Note for Windows 3.x and DOS users
 ==================================
 

diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py
index a41267ae7d533495a75e240aa1d8bb8c89132917..769a2d1acc07639a468674c130b690aa6df5ca2a 100755 (executable)
--- a/Tools/freeze/freeze.py
+++ b/Tools/freeze/freeze.py
@@ -125,7 +125,7 @@ def main():
     # default the exclude list for each platform
     if win: exclude = exclude + [
         'dos', 'dospath', 'mac', 'macpath', 'macfs', 'MACFS', 'posix',
-        'os2', 'ce',
+        'ce',
         ]
 
     fail_import = exclude[:]