Patch #569753: Remove support for WIN16.
Rename all occurrences of MS_WIN32 to MS_WINDOWS.
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index d4caaf0..a42502b 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -8,7 +8,7 @@
#include <sys/types.h>
#endif /* DONT_HAVE_SYS_TYPES_H */
-#ifdef MS_WIN32
+#ifdef MS_WINDOWS
#define fileno _fileno
/* can simulate truncate with Win32 API functions; see file_truncate */
#define HAVE_FTRUNCATE
@@ -480,7 +480,7 @@
if (ret != 0)
goto onioerror;
-#ifdef MS_WIN32
+#ifdef MS_WINDOWS
/* MS _chsize doesn't work if newsize doesn't fit in 32 bits,
so don't even try using it. */
{
@@ -542,7 +542,7 @@
ret = ftruncate(fileno(f->f_fp), newsize);
Py_END_ALLOW_THREADS
if (ret != 0) goto onioerror;
-#endif /* !MS_WIN32 */
+#endif /* !MS_WINDOWS */
Py_INCREF(Py_None);
return Py_None;
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index ae27b7f..1b45ef7 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -41,7 +41,7 @@
#include "unicodeobject.h"
#include "ucnhash.h"
-#ifdef MS_WIN32
+#ifdef MS_WINDOWS
#include <windows.h>
#endif
@@ -2243,7 +2243,7 @@
NULL);
}
-#if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T)
+#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
/* --- MBCS codecs for Windows -------------------------------------------- */
@@ -2305,7 +2305,7 @@
return repr;
}
-#endif /* MS_WIN32 */
+#endif /* MS_WINDOWS */
/* --- Character Mapping Codec -------------------------------------------- */