From 8f3ffb41567c817c9e5d9677bb08ca98cd05b473 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sun, 14 Jul 2024 12:37:00 +0200 Subject: [3.13] gh-121700 Emscripten trampolines not quite right since GH-106219 (GH-121701) (GH-121744) (cherry picked from commit 3086b86cfda829e23a71569908edbfbcdc16327f) Co-authored-by: Hood Chatham --- Include/internal/pycore_object.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index e016ec5..74c1916 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -747,13 +747,7 @@ PyAPI_FUNC(PyObject*) _PyObject_GetState(PyObject *); * Third party code unintentionally rely on problematic fpcasts. The call * trampoline mitigates common occurrences of bad fpcasts on Emscripten. */ -#if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE) -#define _PyCFunction_TrampolineCall(meth, self, args) \ - _PyCFunctionWithKeywords_TrampolineCall( \ - (*(PyCFunctionWithKeywords)(void(*)(void))(meth)), (self), (args), NULL) -extern PyObject* _PyCFunctionWithKeywords_TrampolineCall( - PyCFunctionWithKeywords meth, PyObject *, PyObject *, PyObject *); -#else +#if !(defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE)) #define _PyCFunction_TrampolineCall(meth, self, args) \ (meth)((self), (args)) #define _PyCFunctionWithKeywords_TrampolineCall(meth, self, args, kw) \ -- cgit v0.12