Merge branch 'blender-v2.90-release' into master

4 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index 74d46f6c56f..05a495a75df 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -55,7 +55,7 @@ void BPY_python_start(int argc, const char **argv);
 void BPY_python_end(void);
 void BPY_python_reset(struct bContext *C);
 void BPY_python_use_system_env(void);
-void BPY_python_backtrace(FILE *file);
+void BPY_python_backtrace(/* FILE */ void *file);
 
 /* global interpreter lock */
 
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, ...);
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 3dcd1d944a5..c311041e4cb 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -438,7 +438,7 @@ static void python_script_error_jump_text(struct Text *text)
   }
 }
 
-void BPY_python_backtrace(FILE *fp)
+void BPY_python_backtrace(/* FILE */ void *fp)
 {
   fputs("\n# Python backtrace\n", fp);
   PyC_StackPrint(fp);