Commit 08a8f5ff authored by Benjamin Peterson's avatar Benjamin Peterson

restore compilation on OpenBSD #4146

parent 206e3074
...@@ -15,6 +15,8 @@ What's New in Python 3.0 beta 5 ...@@ -15,6 +15,8 @@ What's New in Python 3.0 beta 5
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #4146: Compilation on OpenBSD has been restored.
- Issue #3574: compile() incorrectly handled source code encoded as Latin-1. - Issue #3574: compile() incorrectly handled source code encoded as Latin-1.
- Issues #2384 and #3975: Tracebacks were not correctly printed when the - Issues #2384 and #3975: Tracebacks were not correctly printed when the
......
...@@ -17,9 +17,9 @@ wmain(int argc, wchar_t **argv) ...@@ -17,9 +17,9 @@ wmain(int argc, wchar_t **argv)
int int
main(int argc, char **argv) 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. */ /* 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; int i, res;
char *oldloc; char *oldloc;
/* 754 requires that FP exceptions run in "no stop" mode by default, /* 754 requires that FP exceptions run in "no stop" mode by default,
...@@ -54,7 +54,7 @@ main(int argc, char **argv) ...@@ -54,7 +54,7 @@ main(int argc, char **argv)
fprintf(stderr, "Could not convert argument %d to string\n", i); fprintf(stderr, "Could not convert argument %d to string\n", i);
return 1; 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]; argv_copy2[i] = argv_copy[i];
if (!argv_copy[i]) { if (!argv_copy[i]) {
fprintf(stderr, "out of memory\n"); fprintf(stderr, "out of memory\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment