wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

python3: fix MSVC "implicit int" build breaker on tinderbox

Browse Source 
Thanks to shm_get for guessing the cause of the problem.

Change-Id: Ieca7199c0c267dc2acaa9ece3ef55747e6a4f816
This commit is contained in:
Michael Stahl
2012-11-27 16:23:12 +01:00
parent ca3590466c
commit ee352d11aa
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
python3/python-3.3.0-implicit-int.patch.1 Normal file
View File

@ -0,0 +1,30 @@
fix function names in import.h
MSVC complains about some declarations in Include/import.h.
Apparently the problem is a missing space between PyAPI_FUNC(int) and the
function name, leading to concatenated int_PyImport... names and no
return type.
diff -ru python3.old/Include/import.h python3/Include/import.h
--- python3.old/Include/import.h 2012-09-29 10:00:26.000000000 +0200
+++ python3/Include/import.h 2012-11-27 16:09:26.449390966 +0100
@@ -86,15 +86,15 @@
PyAPI_FUNC(void) _PyImport_ReInitLock(void);
-PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin(
+PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(
const char *name /* UTF-8 encoded string */
);
-PyAPI_FUNC(PyObject *)_PyImport_FindExtensionObject(PyObject *, PyObject *);
-PyAPI_FUNC(int)_PyImport_FixupBuiltin(
+PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);
+PyAPI_FUNC(int) _PyImport_FixupBuiltin(
PyObject *mod,
char *name /* UTF-8 encoded string */
);
-PyAPI_FUNC(int)_PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
+PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
struct _inittab {
char *name; /* ASCII encoded string */