Skip to content

Commit 42d6f31

Browse files
author
loewis
committed
Patch #569753: Remove support for WIN16.
Rename all occurrences of MS_WIN32 to MS_WINDOWS. git-svn-id: http://svn.python.org/projects/python/trunk@27439 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent ada4479 commit 42d6f31

18 files changed

+102
-241
lines changed

‎Modules/_codecsmodule.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ charmap_decode(PyObject *self,
316316
size);
317317
}
318318

319-
#if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T)
319+
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
320320

321321
static PyObject *
322322
mbcs_decode(PyObject *self,
@@ -334,7 +334,7 @@ mbcs_decode(PyObject *self,
334334
size);
335335
}
336336

337-
#endif /* MS_WIN32 */
337+
#endif /* MS_WINDOWS */
338338

339339
/* --- Encoder ------------------------------------------------------------ */
340340

@@ -636,7 +636,7 @@ charmap_encode(PyObject *self,
636636
return v;
637637
}
638638

639-
#if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T)
639+
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
640640

641641
static PyObject *
642642
mbcs_encode(PyObject *self,
@@ -661,7 +661,7 @@ mbcs_encode(PyObject *self,
661661
return v;
662662
}
663663

664-
#endif /* MS_WIN32 */
664+
#endif /* MS_WINDOWS */
665665
#endif /* Py_USING_UNICODE */
666666

667667
/* --- Module API --------------------------------------------------------- */
@@ -695,7 +695,7 @@ static PyMethodDef _codecs_functions[] = {
695695
{"charmap_decode", charmap_decode, METH_VARARGS},
696696
{"readbuffer_encode", readbuffer_encode, METH_VARARGS},
697697
{"charbuffer_encode", charbuffer_encode, METH_VARARGS},
698-
#if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T)
698+
#if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
699699
{"mbcs_encode", mbcs_encode, METH_VARARGS},
700700
{"mbcs_decode", mbcs_decode, METH_VARARGS},
701701
#endif

‎Modules/_hotshot.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Which timer to use should be made more configurable, but that should not
1313
* be difficult. This will do for now.
1414
*/
15-
#ifdef MS_WIN32
15+
#ifdef MS_WINDOWS
1616
#include <windows.h>
1717
#include <direct.h> /* for getcwd() */
1818
typedef __int64 hs_time;
@@ -90,7 +90,7 @@ typedef struct {
9090
static PyObject * ProfilerError = NULL;
9191

9292

93-
#ifndef MS_WIN32
93+
#ifndef MS_WINDOWS
9494
#ifdef GETTIMEOFDAY_NO_TZ
9595
#define GETTIMEOFDAY(ptv) gettimeofday((ptv))
9696
#else
@@ -818,7 +818,7 @@ static inline int
818818
get_tdelta(ProfilerObject *self)
819819
{
820820
int tdelta;
821-
#ifdef MS_WIN32
821+
#ifdef MS_WINDOWS
822822
hs_time tv;
823823
hs_time diff;
824824

@@ -909,7 +909,7 @@ tracer_callback(ProfilerObject *self, PyFrameObject *frame, int what,
909909

910910
/* A couple of useful helper functions. */
911911

912-
#ifdef MS_WIN32
912+
#ifdef MS_WINDOWS
913913
static LARGE_INTEGER frequency = {0, 0};
914914
#endif
915915

@@ -921,15 +921,15 @@ calibrate(void)
921921
{
922922
hs_time tv1, tv2;
923923

924-
#ifdef MS_WIN32
924+
#ifdef MS_WINDOWS
925925
hs_time diff;
926926
QueryPerformanceFrequency(&frequency);
927927
#endif
928928

929929
GETTIMEOFDAY(&tv1);
930930
while (1) {
931931
GETTIMEOFDAY(&tv2);
932-
#ifdef MS_WIN32
932+
#ifdef MS_WINDOWS
933933
diff = tv2 - tv1;
934934
if (diff != 0) {
935935
timeofday_diff = (unsigned long)diff;
@@ -945,7 +945,7 @@ calibrate(void)
945945
}
946946
#endif
947947
}
948-
#if defined(MS_WIN32) || defined(macintosh) || defined(PYOS_OS2)
948+
#if defined(MS_WINDOWS) || defined(macintosh) || defined(PYOS_OS2)
949949
rusage_diff = -1;
950950
#else
951951
{
@@ -1448,7 +1448,7 @@ write_header(ProfilerObject *self)
14481448
else
14491449
pack_add_info(self, "executable-version", buffer);
14501450

1451-
#ifdef MS_WIN32
1451+
#ifdef MS_WINDOWS
14521452
PyOS_snprintf(cwdbuffer, sizeof(cwdbuffer), "%I64d", frequency.QuadPart);
14531453
pack_add_info(self, "reported-performance-frequency", cwdbuffer);
14541454
#else
@@ -1553,7 +1553,7 @@ hotshot_coverage(PyObject *unused, PyObject *args)
15531553
}
15541554

15551555
PyDoc_VAR(resolution__doc__) =
1556-
#ifdef MS_WIN32
1556+
#ifdef MS_WINDOWS
15571557
PyDoc_STR(
15581558
"resolution() -> (performance-counter-ticks, update-frequency)\n"
15591559
"Return the resolution of the timer provided by the QueryPerformanceCounter()\n"
@@ -1580,7 +1580,7 @@ hotshot_resolution(PyObject *unused, PyObject *args)
15801580
calibrate();
15811581
calibrate();
15821582
}
1583-
#ifdef MS_WIN32
1583+
#ifdef MS_WINDOWS
15841584
result = Py_BuildValue("ii", timeofday_diff, frequency.LowPart);
15851585
#else
15861586
result = Py_BuildValue("ii", timeofday_diff, rusage_diff);

‎Modules/_localemodule.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This software comes with no warranty. Use at your own risk.
2525
#include <libintl.h>
2626
#endif
2727

28-
#if defined(MS_WIN32)
28+
#if defined(MS_WINDOWS)
2929
#define WINDOWS_LEAN_AND_MEAN
3030
#include <windows.h>
3131
#endif
@@ -363,7 +363,7 @@ PyLocale_strxfrm(PyObject* self, PyObject* args)
363363
return result;
364364
}
365365

366-
#if defined(MS_WIN32)
366+
#if defined(MS_WINDOWS)
367367
static PyObject*
368368
PyLocale_getdefaultlocale(PyObject* self)
369369
{
@@ -627,7 +627,7 @@ static struct PyMethodDef PyLocale_Methods[] = {
627627
METH_VARARGS, strcoll__doc__},
628628
{"strxfrm", (PyCFunction) PyLocale_strxfrm,
629629
METH_VARARGS, strxfrm__doc__},
630-
#if defined(MS_WIN32) || defined(macintosh)
630+
#if defined(MS_WINDOWS) || defined(macintosh)
631631
{"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, METH_NOARGS},
632632
#endif
633633
#ifdef HAVE_LANGINFO_H

‎Modules/mmapmodule.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
#include <Python.h>
2222

23-
#ifndef MS_WIN32
23+
#ifndef MS_WINDOWS
2424
#define UNIX
2525
#endif
2626

27-
#ifdef MS_WIN32
27+
#ifdef MS_WINDOWS
2828
#include <windows.h>
2929
static int
3030
my_getpagesize(void)
@@ -75,7 +75,7 @@ typedef struct {
7575
size_t size;
7676
size_t pos;
7777

78-
#ifdef MS_WIN32
78+
#ifdef MS_WINDOWS
7979
HANDLE map_handle;
8080
HANDLE file_handle;
8181
char * tagname;
@@ -92,7 +92,7 @@ typedef struct {
9292
static void
9393
mmap_object_dealloc(mmap_object *m_obj)
9494
{
95-
#ifdef MS_WIN32
95+
#ifdef MS_WINDOWS
9696
if (m_obj->data != NULL)
9797
UnmapViewOfFile (m_obj->data);
9898
if (m_obj->map_handle != INVALID_HANDLE_VALUE)
@@ -101,7 +101,7 @@ mmap_object_dealloc(mmap_object *m_obj)
101101
CloseHandle (m_obj->file_handle);
102102
if (m_obj->tagname)
103103
PyMem_Free(m_obj->tagname);
104-
#endif /* MS_WIN32 */
104+
#endif /* MS_WINDOWS */
105105

106106
#ifdef UNIX
107107
if (m_obj->data!=NULL) {
@@ -118,7 +118,7 @@ mmap_close_method(mmap_object *self, PyObject *args)
118118
{
119119
if (!PyArg_ParseTuple(args, ":close"))
120120
return NULL;
121-
#ifdef MS_WIN32
121+
#ifdef MS_WINDOWS
122122
/* For each resource we maintain, we need to check
123123
the value is valid, and if so, free the resource
124124
and set the member value to an invalid value so
@@ -138,7 +138,7 @@ mmap_close_method(mmap_object *self, PyObject *args)
138138
CloseHandle (self->file_handle);
139139
self->file_handle = INVALID_HANDLE_VALUE;
140140
}
141-
#endif /* MS_WIN32 */
141+
#endif /* MS_WINDOWS */
142142

143143
#ifdef UNIX
144144
munmap(self->data, self->size);
@@ -149,15 +149,15 @@ mmap_close_method(mmap_object *self, PyObject *args)
149149
return (Py_None);
150150
}
151151

152-
#ifdef MS_WIN32
152+
#ifdef MS_WINDOWS
153153
#define CHECK_VALID(err) \
154154
do { \
155155
if (!self->map_handle) { \
156156
PyErr_SetString (PyExc_ValueError, "mmap closed or invalid"); \
157157
return err; \
158158
} \
159159
} while (0)
160-
#endif /* MS_WIN32 */
160+
#endif /* MS_WINDOWS */
161161

162162
#ifdef UNIX
163163
#define CHECK_VALID(err) \
@@ -336,15 +336,15 @@ mmap_size_method(mmap_object *self,
336336
if (!PyArg_ParseTuple(args, ":size"))
337337
return NULL;
338338

339-
#ifdef MS_WIN32
339+
#ifdef MS_WINDOWS
340340
if (self->file_handle != INVALID_HANDLE_VALUE) {
341341
return (Py_BuildValue (
342342
"l", (long)
343343
GetFileSize (self->file_handle, NULL)));
344344
} else {
345345
return (Py_BuildValue ("l", (long) self->size) );
346346
}
347-
#endif /* MS_WIN32 */
347+
#endif /* MS_WINDOWS */
348348

349349
#ifdef UNIX
350350
{
@@ -376,7 +376,7 @@ mmap_resize_method(mmap_object *self,
376376
if (!PyArg_ParseTuple (args, "l:resize", &new_size) ||
377377
!is_resizeable(self)) {
378378
return NULL;
379-
#ifdef MS_WIN32
379+
#ifdef MS_WINDOWS
380380
} else {
381381
DWORD dwErrCode = 0;
382382
/* First, unmap the file view */
@@ -414,7 +414,7 @@ mmap_resize_method(mmap_object *self,
414414
}
415415
PyErr_SetFromWindowsErr(dwErrCode);
416416
return (NULL);
417-
#endif /* MS_WIN32 */
417+
#endif /* MS_WINDOWS */
418418

419419
#ifdef UNIX
420420
#ifndef HAVE_MREMAP
@@ -467,10 +467,10 @@ mmap_flush_method(mmap_object *self, PyObject *args)
467467
"flush values out of range");
468468
return NULL;
469469
} else {
470-
#ifdef MS_WIN32
470+
#ifdef MS_WINDOWS
471471
return (Py_BuildValue("l", (long)
472472
FlushViewOfFile(self->data+offset, size)));
473-
#endif /* MS_WIN32 */
473+
#endif /* MS_WINDOWS */
474474
#ifdef UNIX
475475
/* XXX semantics of return value? */
476476
/* XXX flags for msync? */
@@ -909,7 +909,7 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
909909
}
910910
#endif /* UNIX */
911911

912-
#ifdef MS_WIN32
912+
#ifdef MS_WINDOWS
913913
static PyObject *
914914
new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
915915
{
@@ -1042,7 +1042,7 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
10421042
PyErr_SetFromWindowsErr(dwErr);
10431043
return (NULL);
10441044
}
1045-
#endif /* MS_WIN32 */
1045+
#endif /* MS_WINDOWS */
10461046

10471047
/* List of functions exported by this module */
10481048
static struct PyMethodDef mmap_functions[] = {

0 commit comments

Comments
 (0)