1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

obs-scripting: Add missing Python imports

Browse Source 
Add PyDict_New and PyTuple_New to obs-scripting-python-import.[ch];
these functions are used by SWIG's generated code when I build OBS on
macOS with SWIG 4.0.1.
This commit is contained in:
comex 2020-03-08 17:48:04 -07:00
parent 141c42c4b5
commit 849d5462ad
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/obs-scripting/obs-scripting-python-import.c vendored
View File

@ -108,6 +108,7 @@ bool import_python(const char *python_path)
IMPORT_FUNC(PyExc_RuntimeError); IMPORT_FUNC(PyExc_RuntimeError);
IMPORT_FUNC(PyObject_GetAttr); IMPORT_FUNC(PyObject_GetAttr);
IMPORT_FUNC(PyUnicode_FromString); IMPORT_FUNC(PyUnicode_FromString);
IMPORT_FUNC(PyDict_New);
IMPORT_FUNC(PyDict_GetItemString); IMPORT_FUNC(PyDict_GetItemString);
IMPORT_FUNC(PyDict_SetItemString); IMPORT_FUNC(PyDict_SetItemString);
IMPORT_FUNC(PyCFunction_NewEx); IMPORT_FUNC(PyCFunction_NewEx);
@ -140,6 +141,7 @@ bool import_python(const char *python_path)
IMPORT_FUNC(PyLong_FromUnsignedLongLong); IMPORT_FUNC(PyLong_FromUnsignedLongLong);
IMPORT_FUNC(PyArg_VaParse); IMPORT_FUNC(PyArg_VaParse);
IMPORT_FUNC(_Py_NoneStruct); IMPORT_FUNC(_Py_NoneStruct);
IMPORT_FUNC(PyTuple_New);
#undef IMPORT_FUNC #undef IMPORT_FUNC

4
deps/obs-scripting/obs-scripting-python-import.h vendored
View File

@ -92,6 +92,7 @@ PY_EXTERN PyObject *(*Import_PyExc_TypeError);
PY_EXTERN PyObject *(*Import_PyExc_RuntimeError); PY_EXTERN PyObject *(*Import_PyExc_RuntimeError);
PY_EXTERN PyObject *(*Import_PyObject_GetAttr)(PyObject *, PyObject *); PY_EXTERN PyObject *(*Import_PyObject_GetAttr)(PyObject *, PyObject *);
PY_EXTERN PyObject *(*Import_PyUnicode_FromString)(const char *u); PY_EXTERN PyObject *(*Import_PyUnicode_FromString)(const char *u);
PY_EXTERN PyObject *(*Import_PyDict_New)(void);
PY_EXTERN PyObject *(*Import_PyDict_GetItemString)(PyObject *dp, PY_EXTERN PyObject *(*Import_PyDict_GetItemString)(PyObject *dp,
const char *key); const char *key);
PY_EXTERN int (*Import_PyDict_SetItemString)(PyObject *dp, const char *key, PY_EXTERN int (*Import_PyDict_SetItemString)(PyObject *dp, const char *key,
@ -133,6 +134,7 @@ PY_EXTERN PyObject *(*Import_PyUnicode_AsUTF8String)(PyObject *unicode);
PY_EXTERN PyObject *(*Import_PyLong_FromUnsignedLongLong)(unsigned long long); PY_EXTERN PyObject *(*Import_PyLong_FromUnsignedLongLong)(unsigned long long);
PY_EXTERN int (*Import_PyArg_VaParse)(PyObject *, const char *, va_list); PY_EXTERN int (*Import_PyArg_VaParse)(PyObject *, const char *, va_list);
PY_EXTERN PyObject(*Import__Py_NoneStruct); PY_EXTERN PyObject(*Import__Py_NoneStruct);
PY_EXTERN PyObject *(*Import_PyTuple_New)(Py_ssize_t size);
extern bool import_python(const char *python_path); extern bool import_python(const char *python_path);
@ -174,6 +176,7 @@ extern bool import_python(const char *python_path);
#define PyExc_RuntimeError (*Import_PyExc_RuntimeError) #define PyExc_RuntimeError (*Import_PyExc_RuntimeError)
#define PyObject_GetAttr Import_PyObject_GetAttr #define PyObject_GetAttr Import_PyObject_GetAttr
#define PyUnicode_FromString Import_PyUnicode_FromString #define PyUnicode_FromString Import_PyUnicode_FromString
#define PyDict_New Import_PyDict_New
#define PyDict_GetItemString Import_PyDict_GetItemString #define PyDict_GetItemString Import_PyDict_GetItemString
#define PyDict_SetItemString Import_PyDict_SetItemString #define PyDict_SetItemString Import_PyDict_SetItemString
#define PyCFunction_NewEx Import_PyCFunction_NewEx #define PyCFunction_NewEx Import_PyCFunction_NewEx
@ -206,6 +209,7 @@ extern bool import_python(const char *python_path);
#define PyLong_FromUnsignedLongLong Import_PyLong_FromUnsignedLongLong #define PyLong_FromUnsignedLongLong Import_PyLong_FromUnsignedLongLong
#define PyArg_VaParse Import_PyArg_VaParse #define PyArg_VaParse Import_PyArg_VaParse
#define _Py_NoneStruct (*Import__Py_NoneStruct) #define _Py_NoneStruct (*Import__Py_NoneStruct)
#define PyTuple_New Import_PyTuple_New
#endif #endif
#endif #endif