[Bf-blender-cvs] [ac8348d033] master: Fix 'public' global 'g_atexit' var in Blender.

Bastien Montagne noreply at git.blender.org
Mon Feb 6 17:44:49 CET 2017


Commit: ac8348d0339148deef6f37c8fba0a6793977093b
Author: Bastien Montagne
Date:   Mon Feb 6 17:42:30 2017 +0100
Branches: master
https://developer.blender.org/rBac8348d0339148deef6f37c8fba0a6793977093b

Fix 'public' global 'g_atexit' var in Blender.

No reason to not make this private to this file, and it gave conflict
when using bpy as module and loading it in a GLib application (which
also has a g_atexit var).

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

M	source/blender/blenkernel/intern/blender.c

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

diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index a8670395fc..afd6010245 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -234,7 +234,7 @@ int BKE_blender_test_break(void)
  * \note Don't use MEM_mallocN so functions can be registered at any time.
  * \{ */
 
-struct AtExitData {
+static struct AtExitData {
 	struct AtExitData *next;
 
 	void (*func)(void *user_data);




More information about the Bf-blender-cvs mailing list