[Bf-blender-cvs] [82150f56413] blender-v2.90-release: Workaround release builds failing

Campbell Barton noreply at git.blender.org
Thu Aug 6 11:20:24 CEST 2020


Commit: 82150f564136427b4e0436af41e6f1abd4fe2574
Author: Campbell Barton
Date:   Thu Aug 6 19:19:25 2020 +1000
Branches: blender-v2.90-release
https://developer.blender.org/rB82150f564136427b4e0436af41e6f1abd4fe2574

Workaround release builds failing

Issue caused by e9c4325515aed.

===================================================================

M	source/blender/python/BPY_extern.h
M	source/blender/python/generic/py_capi_utils.c
M	source/blender/python/generic/py_capi_utils.h
M	source/blender/python/intern/bpy_interface.c

===================================================================

diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index 5773f146dcc..42472dda42c 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 0a4f3b5bebd..37ed96bcaa0 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -360,7 +360,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 dfddbc047f9..4fbe2db3ecd 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -436,7 +436,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);



More information about the Bf-blender-cvs mailing list