diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-13 01:09:34 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-13 01:09:34 (GMT) |
| commit | 3d17a5c5aec27ad483f68f36855ee9761181857f (patch) | |
| tree | fb85759d072a4deb86b2460d9de5fec69b0a2a0a /PC/msvcrtmodule.c | |
| parent | e68df0fbe51fc6980d48265e85664341f74fc9eb (diff) | |
| download | cpython-3d17a5c5aec27ad483f68f36855ee9761181857f.zip cpython-3d17a5c5aec27ad483f68f36855ee9761181857f.tar.gz cpython-3d17a5c5aec27ad483f68f36855ee9761181857f.tar.bz2 | |
Merged revisions 64214 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64214 | amaury.forgeotdarc | 2008-06-13 02:42:22 +0200 (ven., 13 juin 2008) | 6 lines
Restore support for Microsoft VC6 compiler.
Some functions in the msvcrt module are skipped,
and socket.ioctl is enabled only when using a more recent Platform SDK.
(and yes, there are still companies that use a 10-years old compiler)
........
Diffstat (limited to 'PC/msvcrtmodule.c')
| -rwxr-xr-x | PC/msvcrtmodule.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index 225121f..542b4f7 100755 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -145,7 +145,7 @@ msvcrt_getch(PyObject *self, PyObject *args) return PyBytes_FromStringAndSize(s, 1); } -#if _MSC_VER >= 1300 +#ifdef _WCONIO_DEFINED static PyObject * msvcrt_getwch(PyObject *self, PyObject *args) { @@ -179,7 +179,7 @@ msvcrt_getche(PyObject *self, PyObject *args) return PyBytes_FromStringAndSize(s, 1); } -#if _MSC_VER >= 1300 +#ifdef _WCONIO_DEFINED static PyObject * msvcrt_getwche(PyObject *self, PyObject *args) { @@ -210,8 +210,7 @@ msvcrt_putch(PyObject *self, PyObject *args) return Py_None; } - -#if _MSC_VER >= 1300 +#ifdef _WCONIO_DEFINED static PyObject * msvcrt_putwch(PyObject *self, PyObject *args) { @@ -246,7 +245,7 @@ msvcrt_ungetch(PyObject *self, PyObject *args) return Py_None; } -#if _MSC_VER >= 1300 +#ifdef _WCONIO_DEFINED static PyObject * msvcrt_ungetwch(PyObject *self, PyObject *args) { @@ -349,7 +348,7 @@ static struct PyMethodDef msvcrt_functions[] = { {"CrtSetReportMode", msvcrt_setreportmode, METH_VARARGS}, {"set_error_mode", msvcrt_seterrormode, METH_VARARGS}, #endif -#if _MSC_VER >= 1300 +#ifdef _WCONIO_DEFINED {"getwch", msvcrt_getwch, METH_VARARGS}, {"getwche", msvcrt_getwche, METH_VARARGS}, {"putwch", msvcrt_putwch, METH_VARARGS}, |