From 64182fe0b39870d30b08da54696c4d02e7b52bc5 Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Tue, 11 Apr 2006 12:14:09 +0000
Subject: Some more changes to make code compile under a C++ compiler.

---
 Modules/gcmodule.c    | 5 +++--
 Modules/getpath.c     | 2 +-
 Modules/main.c        | 4 ++--
 Modules/posixmodule.c | 8 ++++----
 Python/pystrtod.c     | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 5bf95b9..5d9e548 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -1281,7 +1281,8 @@ PyObject *
 _PyObject_GC_Malloc(size_t basicsize)
 {
 	PyObject *op;
-	PyGC_Head *g = PyObject_MALLOC(sizeof(PyGC_Head) + basicsize);
+	PyGC_Head *g = (PyGC_Head *)PyObject_MALLOC(
+                sizeof(PyGC_Head) + basicsize);
 	if (g == NULL)
 		return PyErr_NoMemory();
 	g->gc.gc_refs = GC_UNTRACKED;
@@ -1323,7 +1324,7 @@ _PyObject_GC_Resize(PyVarObject *op, Py_ssize_t nitems)
 {
 	const size_t basicsize = _PyObject_VAR_SIZE(op->ob_type, nitems);
 	PyGC_Head *g = AS_GC(op);
-	g = PyObject_REALLOC(g,  sizeof(PyGC_Head) + basicsize);
+	g = (PyGC_Head *)PyObject_REALLOC(g,  sizeof(PyGC_Head) + basicsize);
 	if (g == NULL)
 		return (PyVarObject *)PyErr_NoMemory();
 	op = (PyVarObject *) FROM_GC(g);
diff --git a/Modules/getpath.c b/Modules/getpath.c
index 4716d15..40c3692 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -566,7 +566,7 @@ calculate_path(void)
     bufsz += strlen(exec_prefix) + 1;
 
     /* This is the only malloc call in this file */
-    buf = PyMem_Malloc(bufsz);
+    buf = (char *)PyMem_Malloc(bufsz);
 
     if (buf == NULL) {
         /* We can't exit, so print a warning and limp along */
diff --git a/Modules/main.c b/Modules/main.c
index 913e82e..ceb5bed 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -208,7 +208,7 @@ Py_Main(int argc, char **argv)
 			/* -c is the last option; following arguments
 			   that look like options are left for the
 			   command to interpret. */
-			command = malloc(strlen(_PyOS_optarg) + 2);
+			command = (char *)malloc(strlen(_PyOS_optarg) + 2);
 			if (command == NULL)
 				Py_FatalError(
 				   "not enough memory to copy -c argument");
@@ -221,7 +221,7 @@ Py_Main(int argc, char **argv)
 			/* -m is the last option; following arguments
 			   that look like options are left for the
 			   module to interpret. */
-			module = malloc(strlen(_PyOS_optarg) + 2);
+			module = (char *)malloc(strlen(_PyOS_optarg) + 2);
 			if (module == NULL)
 				Py_FatalError(
 				   "not enough memory to copy -m argument");
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index a0a8d9a..4cd220e 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -6009,7 +6009,7 @@ static PyObject *
 posix_putenv(PyObject *self, PyObject *args)
 {
         char *s1, *s2;
-        char *new;
+        char *newenv;
 	PyObject *newstr;
 	size_t len;
 
@@ -6040,9 +6040,9 @@ posix_putenv(PyObject *self, PyObject *args)
 	newstr = PyString_FromStringAndSize(NULL, (int)len - 1);
 	if (newstr == NULL)
 		return PyErr_NoMemory();
-	new = PyString_AS_STRING(newstr);
-	PyOS_snprintf(new, len, "%s=%s", s1, s2);
-	if (putenv(new)) {
+	newenv = PyString_AS_STRING(newstr);
+	PyOS_snprintf(newenv, len, "%s=%s", s1, s2);
+	if (putenv(newenv)) {
                 Py_DECREF(newstr);
                 posix_error();
                 return NULL;
diff --git a/Python/pystrtod.c b/Python/pystrtod.c
index 83e792d..db4cad1 100644
--- a/Python/pystrtod.c
+++ b/Python/pystrtod.c
@@ -101,7 +101,7 @@ PyOS_ascii_strtod(const char *nptr, char **endptr)
 		char *copy, *c;
 
 		/* We need to convert the '.' to the locale specific decimal point */
-		copy = malloc(end - nptr + 1 + decimal_point_len);
+		copy = (char *)malloc(end - nptr + 1 + decimal_point_len);
 
 		c = copy;
 		memcpy(c, nptr, decimal_point_pos - nptr);
-- 
cgit v0.12