diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-08-06 12:20:32 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-06 12:20:32 +0300 |
commit | 3439cbcc69eebc393bc4c52fdf69e8f2fe9a53ff (patch) | |
tree | 7d53e5351314e1d2eaa241f478b585329fc19360 /source/blender/python/generic | |
parent | 8a8c3e09720c2ee3699066aa243baa56e30220a9 (diff) | |
parent | 82150f564136427b4e0436af41e6f1abd4fe2574 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/python/generic')
-rw-r--r-- | source/blender/python/generic/py_capi_utils.c | 2 | ||||
-rw-r--r-- | source/blender/python/generic/py_capi_utils.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index 413e27589fd..543cd3b4214 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -383,7 +383,7 @@ void PyC_StackSpit(void) } } -void PyC_StackPrint(FILE *fp) +void PyC_StackPrint(/* FILE */ void *fp) { PyThreadState *tstate = PyGILState_GetThisThreadState(); if (tstate != NULL && tstate->frame != NULL) { diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h index 7950ee2c968..dde450012d0 100644 --- a/source/blender/python/generic/py_capi_utils.h +++ b/source/blender/python/generic/py_capi_utils.h @@ -28,7 +28,7 @@ void PyC_ObSpit(const char *name, PyObject *var); void PyC_ObSpitStr(char *result, size_t result_len, PyObject *var); void PyC_LineSpit(void); void PyC_StackSpit(void); -void PyC_StackPrint(FILE *fp); +void PyC_StackPrint(/* FILE */ void *fp); PyObject *PyC_ExceptionBuffer(void); PyObject *PyC_ExceptionBuffer_Simple(void); PyObject *PyC_Object_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...); |