diff options
| author | Georg Brandl <georg@python.org> | 2013-10-28 08:08:09 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-28 08:08:09 +0100 |
| commit | 03b9c293da396efd6df7fb0d980db0faa8bb4b49 (patch) | |
| tree | 9d1da9bb4648df90b7f435bc5eadc38c26da011e /Objects/exceptions.c | |
| parent | bc3101edfd79f9d63af2f7503c94e1c5390f9074 (diff) | |
| parent | 8d7b2d90166762520cd2f911bb3bcaf71c41c98c (diff) | |
| download | cpython-03b9c293da396efd6df7fb0d980db0faa8bb4b49.tar.gz | |
null merge with 3.3
Diffstat (limited to 'Objects/exceptions.c')
| -rw-r--r-- | Objects/exceptions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 6b04700621..de5d746858 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -121,11 +121,11 @@ BaseException_str(PyBaseExceptionObject *self) static PyObject * BaseException_repr(PyBaseExceptionObject *self) { - char *name; - char *dot; + const char *name; + const char *dot; - name = (char *)Py_TYPE(self)->tp_name; - dot = strrchr(name, '.'); + name = Py_TYPE(self)->tp_name; + dot = (const char *) strrchr(name, '.'); if (dot != NULL) name = dot+1; return PyUnicode_FromFormat("%s%R", name, self->args); @@ -2327,7 +2327,7 @@ PyObject *PyExc_RecursionErrorInst = NULL; } #ifdef MS_WINDOWS -#include <Winsock2.h> +#include <winsock2.h> /* The following constants were added to errno.h in VS2010 but have preferred WSA equivalents. */ #undef EADDRINUSE |