summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-26 05:32:41 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-26 05:32:41 (GMT)
commit5616c6d6904e7863a0400a549fac7d1a50635ed0 (patch)
tree27fe7409fd2ddd033c57360561bccada2c8629ce
parent3c814d2550b607672365b645b3283685858f7a82 (diff)
downloadcpython-5616c6d6904e7863a0400a549fac7d1a50635ed0.zip
cpython-5616c6d6904e7863a0400a549fac7d1a50635ed0.tar.gz
cpython-5616c6d6904e7863a0400a549fac7d1a50635ed0.tar.bz2
Fix a couple of warnings
-rw-r--r--Modules/cjkcodecs/cjkcodecs.h2
-rw-r--r--Python/import.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
index 9449c1f..3ec24cb 100644
--- a/Modules/cjkcodecs/cjkcodecs.h
+++ b/Modules/cjkcodecs/cjkcodecs.h
@@ -266,7 +266,7 @@ getcodec(PyObject *self, PyObject *encoding)
"encoding name must be a string.");
return NULL;
}
- enc = PyUnicode_AsString(encoding, NULL);
+ enc = PyUnicode_AsString(encoding);
if (enc == NULL)
return NULL;
diff --git a/Python/import.c b/Python/import.c
index 72138c2..24eeada 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2366,7 +2366,7 @@ PyImport_ReloadModule(PyObject *m)
"reload() argument must be module");
return NULL;
}
- name = PyModule_GetName(m);
+ name = (char*)PyModule_GetName(m);
if (name == NULL)
return NULL;
if (m != PyDict_GetItemString(modules, name)) {