Index: Python/errors.c
===================================================================
--- Python/errors.c	(revision 56957)
+++ Python/errors.c	(arbetskopia)
@@ -529,7 +529,7 @@
 
 
 PyObject *
-PyErr_NewException(char *name, PyObject *base, PyObject *dict)
+PyErr_NewException(const char *name, PyObject *base, PyObject *dict)
 {
 	char *dot;
 	PyObject *modulename = NULL;
Index: Include/abstract.h
===================================================================
--- Include/abstract.h	(revision 56957)
+++ Include/abstract.h	(arbetskopia)
@@ -324,7 +324,7 @@
        */
 
      PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object,
-                                                 char *format, ...);
+                                                 const char *format, ...);
 
        /*
 	 Call a callable Python object, callable_object, with a
@@ -337,8 +337,8 @@
        */
 
 
-     PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, char *m,
-                                               char *format, ...);
+     PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, const char *m,
+                                               const char *format, ...);
 
        /*
 	 Call the method named m of object o with a variable number of
@@ -350,10 +350,10 @@
        */
 
      PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
-							 char *format, ...);
+						       const char *format, ...);
      PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o,
-						       char *name,
-						       char *format, ...);
+						       const char *name,
+						       const char *format, ...);
 
      PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
                                                         ...);
@@ -471,7 +471,7 @@
 	 statement: o[key]=v.
        */
 
-     PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, char *key);
+     PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, const char *key);
 
        /*
          Remove the mapping for object, key, from the object *o.
Index: Include/pyerrors.h
===================================================================
--- Include/pyerrors.h	(revision 56957)
+++ Include/pyerrors.h	(arbetskopia)
@@ -219,7 +219,7 @@
 #define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
 
 /* Function to create a new exception */
-PyAPI_FUNC(PyObject *) PyErr_NewException(char *name, PyObject *base,
+PyAPI_FUNC(PyObject *) PyErr_NewException(const char *name, PyObject *base,
                                          PyObject *dict);
 PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *);
 
Index: Objects/abstract.c
===================================================================
--- Objects/abstract.c	(revision 56957)
+++ Objects/abstract.c	(arbetskopia)
@@ -200,7 +200,7 @@
 }
 
 int
-PyObject_DelItemString(PyObject *o, char *key)
+PyObject_DelItemString(PyObject *o, const char *key)
 {
 	PyObject *okey;
 	int ret;
@@ -1896,7 +1896,7 @@
 }
 
 PyObject *
-PyObject_CallFunction(PyObject *callable, char *format, ...)
+PyObject_CallFunction(PyObject *callable, const char *format, ...)
 {
 	va_list va;
 	PyObject *args;
@@ -1916,7 +1916,7 @@
 }
 
 PyObject *
-_PyObject_CallFunction_SizeT(PyObject *callable, char *format, ...)
+_PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...)
 {
 	va_list va;
 	PyObject *args;
@@ -1936,7 +1936,7 @@
 }
 
 PyObject *
-PyObject_CallMethod(PyObject *o, char *name, char *format, ...)
+PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...)
 {
 	va_list va;
 	PyObject *args;
@@ -1975,7 +1975,7 @@
 }
 
 PyObject *
-_PyObject_CallMethod_SizeT(PyObject *o, char *name, char *format, ...)
+_PyObject_CallMethod_SizeT(PyObject *o, const char *name, const char *format, ...)
 {
 	va_list va;
 	PyObject *args;