summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2008-07-15 17:14:51 (GMT)
committerThomas Heller <theller@ctypes.org>2008-07-15 17:14:51 (GMT)
commitd88ddfa94ae112957e49093550c096415ef0cd33 (patch)
treed09a4c6c401d521d5151b3aee64b5cd7182d145b
parent0d755b4e2b6af874781e01dd1ceb70e3a9b84045 (diff)
downloadcpython-d88ddfa94ae112957e49093550c096415ef0cd33.zip
cpython-d88ddfa94ae112957e49093550c096415ef0cd33.tar.gz
cpython-d88ddfa94ae112957e49093550c096415ef0cd33.tar.bz2
Make these files to compile again under Windows.
-rw-r--r--Python/pythonrun.c5
-rw-r--r--Python/sysmodule.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index ad758a6..d13563f 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1340,9 +1340,10 @@ print_exception(PyObject *f, PyObject *value)
/* Don't do anything else */
}
else {
- assert(PyExceptionClass_Check(type));
PyObject* moduleName;
- char* className = PyExceptionClass_Name(type);
+ char* className;
+ assert(PyExceptionClass_Check(type));
+ className = PyExceptionClass_Name(type);
if (className != NULL) {
char *dot = strrchr(className, '.');
if (dot != NULL)
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 896b2cd..4017ac2 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -616,6 +616,7 @@ sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds)
static PyObject *str__sizeof__, *gc_head_size = NULL;
static char *kwlist[] = {"object", "default", 0};
PyObject *o, *dflt = NULL;
+ PyObject *method;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:getsizeof",
kwlist, &o, &dflt))
@@ -639,7 +640,7 @@ sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds)
if (PyType_Ready(Py_TYPE(o)) < 0)
return NULL;
- PyObject *method = _PyType_Lookup(Py_TYPE(o), str__sizeof__);
+ method = _PyType_Lookup(Py_TYPE(o), str__sizeof__);
if (method == NULL)
PyErr_Format(PyExc_TypeError,
"Type %.100s doesn't define __sizeof__",