mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-18 06:14:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christian Heimes 2008-01-04 13:33:00 +00:00
parent 8fd7b0c1a7
commit c36625b05d
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Include/abstract.h
View File

@ -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.
*/

1
Modules/errnomodule.c
View File

@ -5,6 +5,7 @@
/* Windows socket errors (WSA*) */
#ifdef MS_WINDOWS
#define WIN32_LEAN_AND_MEAN
#include <winsock.h>
#endif

1
Modules/selectmodule.c
View File

@ -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

1
Modules/socketmodule.h
View File

@ -22,6 +22,7 @@
# define HAVE_GETNAMEINFO
# define ENABLE_IPV6
#else
# define WIN32_LEAN_AND_MEAN
# include <winsock.h>
#endif
#endif

2
Objects/longobject.c
View File

@ -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 *

10
PC/msvcrtmodule.c
View File

@ -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}
};