[Python-3000-checkins] r66976 - in python/branches/py3k: Misc/NEWS Modules/python.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Oct 19 16:15:00 2008
New Revision: 66976

Log:
restore compilation on OpenBSD #4146

Modified:
python/branches/py3k/Misc/NEWS
python/branches/py3k/Modules/python.c

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Sun Oct 19 16:15:00 2008
@@ -15,6 +15,8 @@
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

Modified: python/branches/py3k/Modules/python.c
==============================================================================
--- python/branches/py3k/Modules/python.c (original)
+++ python/branches/py3k/Modules/python.c Sun Oct 19 16:15:00 2008
@@ -17,9 +17,9 @@
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 @@
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");