From 08a8f5fff90b826553e833c1caee0fd8f7711cb0 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 19 Oct 2008 14:15:00 +0000 Subject: restore compilation on OpenBSD #4146 --- Misc/NEWS | 2 ++ Modules/python.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index a9adda9..5b5a125 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,8 @@ What's New in Python 3.0 beta 5 Core and Builtins ----------------- +- Issue #4146: Compilation on OpenBSD has been restored. + - Issue #3574: compile() incorrectly handled source code encoded as Latin-1. - Issues #2384 and #3975: Tracebacks were not correctly printed when the diff --git a/Modules/python.c b/Modules/python.c index bf1ba9a..9e78889 100644 --- a/Modules/python.c +++ b/Modules/python.c @@ -17,9 +17,9 @@ wmain(int argc, wchar_t **argv) int main(int argc, char **argv) { - wchar_t **argv_copy = PyMem_Malloc(sizeof(wchar_t*)*argc); + wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*argc); /* We need a second copies, as Python might modify the first one. */ - wchar_t **argv_copy2 = PyMem_Malloc(sizeof(wchar_t*)*argc); + wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*argc); int i, res; char *oldloc; /* 754 requires that FP exceptions run in "no stop" mode by default, @@ -54,7 +54,7 @@ main(int argc, char **argv) fprintf(stderr, "Could not convert argument %d to string\n", i); return 1; } - argv_copy[i] = PyMem_Malloc((argsize+1)*sizeof(wchar_t)); + argv_copy[i] = (wchar_t *)PyMem_Malloc((argsize+1)*sizeof(wchar_t)); argv_copy2[i] = argv_copy[i]; if (!argv_copy[i]) { fprintf(stderr, "out of memory\n"); -- cgit v0.12