mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#70393: move python3 to a subdir of external

Browse Source 
Change-Id: Ic5796f096255d2d84e39415324e8a2e06bcf09c9
Reviewed-on: https://gerrit.libreoffice.org/6550
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Khaled Hosny
2013-11-03 20:28:42 +02:00
committed by David Tardon
parent 45053900a4
commit 9dc3f0f5af
24 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
external/python3/python-3.3.0-implicit-int.patch.1 vendored 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 */