Some VS 6.0 compatibility fixes from Hirokazu Yamamoto which are also useful for later versions of MSVC. VS6 claims that fortran is a reserved word

tiran · tiran · commit c36625b05df8 · 2008-01-04T13:33:00.000Z
diff --git a/Include/abstract.h b/Include/abstract.h
@@ -570,11 +570,11 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
 	   error (i.e. the object does not have a buffer interface or
 	   it is not working).
 
-	   If fortran is 'F', then if the object is multi-dimensional,
+	   If fort is 'F', then if the object is multi-dimensional,
 	   then the data will be copied into the array in
 	   Fortran-style (first dimension varies the fastest).  If
-	   fortran is 'C', then the data will be copied into the array
-	   in C-style (last dimension varies the fastest).  If fortran
+	   fort is 'C', then the data will be copied into the array
+	   in C-style (last dimension varies the fastest).  If fort
 	   is 'A', then it does not matter and the copy will be made
 	   in whatever way is more efficient.
 
@@ -585,7 +585,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
         /* Copy the data from the src buffer to the buffer of destination
          */
 
-     PyAPI_FUNC(int) PyBuffer_IsContiguous(Py_buffer *view, char fortran);
+     PyAPI_FUNC(int) PyBuffer_IsContiguous(Py_buffer *view, char fort);
 
 
      PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims, 
@@ -595,7 +595,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
 	     					    char fort);
 
        	/*  Fill the strides array with byte-strides of a contiguous
-            (Fortran-style if fortran is 'F' or C-style otherwise)
+            (Fortran-style if fort is 'F' or C-style otherwise)
             array of the given shape with the given number of bytes
             per element.
         */
diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
@@ -5,6 +5,7 @@
 
 /* Windows socket errors (WSA*)  */
 #ifdef MS_WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <winsock.h>
 #endif
 
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
@@ -44,6 +44,7 @@ extern void bzero(void *, int);
 #endif
 
 #ifdef MS_WINDOWS
+#  define WIN32_LEAN_AND_MEAN
 #  include <winsock.h>
 #else
 #  define SOCKET int
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
@@ -22,6 +22,7 @@
 # define HAVE_GETNAMEINFO
 # define ENABLE_IPV6
 #else
+# define WIN32_LEAN_AND_MEAN
 # include <winsock.h>
 #endif
 #endif
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -3530,7 +3530,7 @@ long_getnewargs(PyLongObject *v)
 
 static PyObject *
 long_getN(PyLongObject *v, void *context) {
-	return PyLong_FromLong((intptr_t)context);
+	return PyLong_FromLong((Py_intptr_t)context);
 }
 
 static PyObject *
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
@@ -145,6 +145,7 @@ msvcrt_getch(PyObject *self, PyObject *args)
 	return PyString_FromStringAndSize(s, 1);
 }
 
+#if _MSC_VER >= 1300
 static PyObject *
 msvcrt_getwch(PyObject *self, PyObject *args)
 {
@@ -160,6 +161,7 @@ msvcrt_getwch(PyObject *self, PyObject *args)
 	u[0] = ch;
 	return PyUnicode_FromUnicode(u, 1);
 }
+#endif
 
 static PyObject *
 msvcrt_getche(PyObject *self, PyObject *args)
@@ -177,6 +179,7 @@ msvcrt_getche(PyObject *self, PyObject *args)
 	return PyString_FromStringAndSize(s, 1);
 }
 
+#if _MSC_VER >= 1300
 static PyObject *
 msvcrt_getwche(PyObject *self, PyObject *args)
 {
@@ -192,6 +195,7 @@ msvcrt_getwche(PyObject *self, PyObject *args)
 	s[0] = ch;
 	return PyUnicode_FromUnicode(s, 1);
 }
+#endif
 
 static PyObject *
 msvcrt_putch(PyObject *self, PyObject *args)
@@ -207,6 +211,7 @@ msvcrt_putch(PyObject *self, PyObject *args)
 }
 
 
+#if _MSC_VER >= 1300
 static PyObject *
 msvcrt_putwch(PyObject *self, PyObject *args)
 {
@@ -225,6 +230,7 @@ msvcrt_putwch(PyObject *self, PyObject *args)
 	Py_RETURN_NONE;
 
 }
+#endif
 
 static PyObject *
 msvcrt_ungetch(PyObject *self, PyObject *args)
@@ -240,6 +246,7 @@ msvcrt_ungetch(PyObject *self, PyObject *args)
 	return Py_None;
 }
 
+#if _MSC_VER >= 1300
 static PyObject *
 msvcrt_ungetwch(PyObject *self, PyObject *args)
 {
@@ -253,6 +260,7 @@ msvcrt_ungetwch(PyObject *self, PyObject *args)
 	Py_INCREF(Py_None);
 	return Py_None;
 }
+#endif
 
 static void
 insertint(PyObject *d, char *name, int value)
@@ -341,10 +349,12 @@ static struct PyMethodDef msvcrt_functions[] = {
 	{"CrtSetReportMode",	msvcrt_setreportmode, METH_VARARGS},
 	{"set_error_mode",	msvcrt_seterrormode, METH_VARARGS},
 #endif
+#if _MSC_VER >= 1300
 	{"getwch",		msvcrt_getwch, METH_VARARGS},
 	{"getwche",		msvcrt_getwche, METH_VARARGS},
 	{"putwch",		msvcrt_putwch, METH_VARARGS},
 	{"ungetwch",		msvcrt_ungetwch, METH_VARARGS},
+#endif
 	{NULL,			NULL}
 };
 

Original file line number	Diff line number	Diff line change
`@@ -3530,7 +3530,7 @@ long_getnewargs(PyLongObject *v)`
`3530`	`3530`
`3531`	`3531`	`static PyObject *`
`3532`	`3532`	`long_getN(PyLongObject v, void context) {`
`3533`		`- return PyLong_FromLong((intptr_t)context);`
	`3533`	`+ return PyLong_FromLong((Py_intptr_t)context);`
`3534`	`3534`	`}`
`3535`	`3535`
`3536`	`3536`	`static PyObject *`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ msvcrt_getch(PyObject self, PyObject args)`
`145`	`145`	`return PyString_FromStringAndSize(s, 1);`
`146`	`146`	`}`
`147`	`147`
	`148`	`+#if _MSC_VER >= 1300`
`148`	`149`	`static PyObject *`
`149`	`150`	`msvcrt_getwch(PyObject self, PyObject args)`
`150`	`151`	`{`
`@@ -160,6 +161,7 @@ msvcrt_getwch(PyObject self, PyObject args)`
`160`	`161`	`u[0] = ch;`
`161`	`162`	`return PyUnicode_FromUnicode(u, 1);`
`162`	`163`	`}`
	`164`	`+#endif`
`163`	`165`
`164`	`166`	`static PyObject *`
`165`	`167`	`msvcrt_getche(PyObject self, PyObject args)`
`@@ -177,6 +179,7 @@ msvcrt_getche(PyObject self, PyObject args)`
`177`	`179`	`return PyString_FromStringAndSize(s, 1);`
`178`	`180`	`}`
`179`	`181`
	`182`	`+#if _MSC_VER >= 1300`
`180`	`183`	`static PyObject *`
`181`	`184`	`msvcrt_getwche(PyObject self, PyObject args)`
`182`	`185`	`{`
`@@ -192,6 +195,7 @@ msvcrt_getwche(PyObject self, PyObject args)`
`192`	`195`	`s[0] = ch;`
`193`	`196`	`return PyUnicode_FromUnicode(s, 1);`
`194`	`197`	`}`
	`198`	`+#endif`
`195`	`199`
`196`	`200`	`static PyObject *`
`197`	`201`	`msvcrt_putch(PyObject self, PyObject args)`
`@@ -207,6 +211,7 @@ msvcrt_putch(PyObject self, PyObject args)`
`207`	`211`	`}`
`208`	`212`
`209`	`213`
	`214`	`+#if _MSC_VER >= 1300`
`210`	`215`	`static PyObject *`
`211`	`216`	`msvcrt_putwch(PyObject self, PyObject args)`
`212`	`217`	`{`
`@@ -225,6 +230,7 @@ msvcrt_putwch(PyObject self, PyObject args)`
`225`	`230`	`Py_RETURN_NONE;`
`226`	`231`
`227`	`232`	`}`
	`233`	`+#endif`
`228`	`234`
`229`	`235`	`static PyObject *`
`230`	`236`	`msvcrt_ungetch(PyObject self, PyObject args)`
`@@ -240,6 +246,7 @@ msvcrt_ungetch(PyObject self, PyObject args)`
`240`	`246`	`return Py_None;`
`241`	`247`	`}`
`242`	`248`
	`249`	`+#if _MSC_VER >= 1300`
`243`	`250`	`static PyObject *`
`244`	`251`	`msvcrt_ungetwch(PyObject self, PyObject args)`
`245`	`252`	`{`
`@@ -253,6 +260,7 @@ msvcrt_ungetwch(PyObject self, PyObject args)`
`253`	`260`	`Py_INCREF(Py_None);`
`254`	`261`	`return Py_None;`
`255`	`262`	`}`
	`263`	`+#endif`
`256`	`264`
`257`	`265`	`static void`
`258`	`266`	`insertint(PyObject d, char name, int value)`
`@@ -341,10 +349,12 @@ static struct PyMethodDef msvcrt_functions[] = {`
`341`	`349`	`{"CrtSetReportMode", msvcrt_setreportmode, METH_VARARGS},`
`342`	`350`	`{"set_error_mode", msvcrt_seterrormode, METH_VARARGS},`
`343`	`351`	`#endif`
	`352`	`+#if _MSC_VER >= 1300`
`344`	`353`	`{"getwch", msvcrt_getwch, METH_VARARGS},`
`345`	`354`	`{"getwche", msvcrt_getwche, METH_VARARGS},`
`346`	`355`	`{"putwch", msvcrt_putwch, METH_VARARGS},`
`347`	`356`	`{"ungetwch", msvcrt_ungetwch, METH_VARARGS},`
	`357`	`+#endif`
`348`	`358`	`{NULL, NULL}`
`349`	`359`	`};`
`350`	`360`