[Bf-blender-cvs] [865025c343a] master: Cleanup: remove stdio.h header from MEM_guardedalloc.h
Campbell Barton
noreply at git.blender.org
Wed Mar 24 09:38:05 CET 2021
Commit: 865025c343ac38f649b671d74fb6903dc2ec87da
Author: Campbell Barton
Date: Wed Mar 24 16:43:17 2021 +1100
Branches: master
https://developer.blender.org/rB865025c343ac38f649b671d74fb6903dc2ec87da
Cleanup: remove stdio.h header from MEM_guardedalloc.h
This was included for `FILE *` which isn't used in the header.
Ref D10799
===================================================================
M intern/clog/clog.c
M intern/guardedalloc/MEM_guardedalloc.h
M intern/guardedalloc/intern/leak_detector.cc
M intern/guardedalloc/intern/mallocn_guarded_impl.c
M intern/guardedalloc/intern/mallocn_lockfree_impl.c
M source/blender/blenkernel/intern/keyconfig.c
M source/blender/blenkernel/intern/text_suggestions.c
M source/blender/blenkernel/intern/undo_system.c
M source/blender/blenkernel/intern/workspace.c
M source/blender/blenlib/intern/BLI_args.c
M source/blender/blenlib/intern/BLI_dynstr.c
M source/blender/blenlib/intern/edgehash.c
M source/blender/blenlib/intern/string.c
M source/blender/editors/interface/interface_style.c
M source/blender/editors/interface/interface_template_search_menu.c
M source/blender/gpu/intern/gpu_material_library.c
M source/blender/gpu/intern/gpu_node_graph.c
M source/blender/imbuf/intern/thumbs_blend.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
M source/blender/windowmanager/intern/wm_menu_type.c
M source/blender/windowmanager/intern/wm_uilist_type.c
===================================================================
diff --git a/intern/clog/clog.c b/intern/clog/clog.c
index 391b71d77de..01d1c0a1770 100644
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -21,6 +21,7 @@
#include <assert.h>
#include <stdarg.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index df5593ba484..3d51c04f929 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -49,8 +49,6 @@
#ifndef __MEM_GUARDEDALLOC_H__
#define __MEM_GUARDEDALLOC_H__
-#include <stdio.h> /* needed for FILE* */
-
/* Needed for uintptr_t and attributes, exception, don't use BLI anywhere else in `MEM_*` */
#include "../../source/blender/blenlib/BLI_compiler_attrs.h"
#include "../../source/blender/blenlib/BLI_sys_types.h"
diff --git a/intern/guardedalloc/intern/leak_detector.cc b/intern/guardedalloc/intern/leak_detector.cc
index fb8d4e72cac..3ce6996649e 100644
--- a/intern/guardedalloc/intern/leak_detector.cc
+++ b/intern/guardedalloc/intern/leak_detector.cc
@@ -19,6 +19,7 @@
*/
#include <cstdlib>
+#include <stdio.h> /* Needed for `printf` on WIN32/APPLE. */
#include "MEM_guardedalloc.h"
#include "mallocn_intern.h"
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c
index 6a0d104d47d..a7c3dc0951e 100644
--- a/intern/guardedalloc/intern/mallocn_guarded_impl.c
+++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c
@@ -25,6 +25,7 @@
#include <stdarg.h>
#include <stddef.h> /* offsetof */
+#include <stdio.h> /* printf */
#include <stdlib.h>
#include <string.h> /* memcpy */
#include <sys/types.h>
diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
index 8f5c9cf85a9..a843086a1f1 100644
--- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c
+++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
@@ -21,6 +21,7 @@
*/
#include <stdarg.h>
+#include <stdio.h> /* printf */
#include <stdlib.h>
#include <string.h> /* memcpy */
#include <sys/types.h>
diff --git a/source/blender/blenkernel/intern/keyconfig.c b/source/blender/blenkernel/intern/keyconfig.c
index ada5fc5b6aa..552760c9b34 100644
--- a/source/blender/blenkernel/intern/keyconfig.c
+++ b/source/blender/blenkernel/intern/keyconfig.c
@@ -19,6 +19,7 @@
*/
#include <stddef.h>
+#include <stdio.h>
#include <stdlib.h>
#include "RNA_types.h"
diff --git a/source/blender/blenkernel/intern/text_suggestions.c b/source/blender/blenkernel/intern/text_suggestions.c
index 6df1aff722b..d717b88e8ca 100644
--- a/source/blender/blenkernel/intern/text_suggestions.c
+++ b/source/blender/blenkernel/intern/text_suggestions.c
@@ -22,6 +22,7 @@
*/
#include <ctype.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c
index 52f0fe3f5a2..377802f1af7 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -20,6 +20,7 @@
* Used by ED_undo.h, internal implementation.
*/
+#include <stdio.h>
#include <string.h>
#include "CLG_log.h"
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index 481d190952f..be67b2370e3 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -18,6 +18,7 @@
* \ingroup bke
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/source/blender/blenlib/intern/BLI_args.c b/source/blender/blenlib/intern/BLI_args.c
index 07ab4f407f2..70a51982925 100644
--- a/source/blender/blenlib/intern/BLI_args.c
+++ b/source/blender/blenlib/intern/BLI_args.c
@@ -23,6 +23,7 @@
*/
#include <ctype.h> /* for tolower */
+#include <stdio.h>
#include <string.h>
#include "MEM_guardedalloc.h"
diff --git a/source/blender/blenlib/intern/BLI_dynstr.c b/source/blender/blenlib/intern/BLI_dynstr.c
index 3e80f791fa5..7b25fecfa45 100644
--- a/source/blender/blenlib/intern/BLI_dynstr.c
+++ b/source/blender/blenlib/intern/BLI_dynstr.c
@@ -22,6 +22,7 @@
* \ingroup bli
*/
+#include <stdio.h>
#include <stdlib.h> /* malloc */
#include <string.h>
diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index 05ee02ad869..b8bf535a3b4 100644
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -24,6 +24,7 @@
*/
#include <limits.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index 3bfedd6f586..ccc11af9f2b 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -25,6 +25,7 @@
#include <inttypes.h>
#include <math.h>
#include <stdarg.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c
index eaefc2c3736..ad0c523a594 100644
--- a/source/blender/editors/interface/interface_style.c
+++ b/source/blender/editors/interface/interface_style.c
@@ -23,6 +23,7 @@
#include <limits.h>
#include <math.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/source/blender/editors/interface/interface_template_search_menu.c b/source/blender/editors/interface/interface_template_search_menu.c
index 74668b2f3a3..ff42d434f29 100644
--- a/source/blender/editors/interface/interface_template_search_menu.c
+++ b/source/blender/editors/interface/interface_template_search_menu.c
@@ -21,6 +21,7 @@
* Accessed via the #WM_OT_search_menu operator.
*/
+#include <stdio.h>
#include <string.h>
#include "MEM_guardedalloc.h"
diff --git a/source/blender/gpu/intern/gpu_material_library.c b/source/blender/gpu/intern/gpu_material_library.c
index 64cd375d466..175facc0a8d 100644
--- a/source/blender/gpu/intern/gpu_material_library.c
+++ b/source/blender/gpu/intern/gpu_material_library.c
@@ -23,6 +23,7 @@
* GPU material library parsing and code generation.
*/
+#include <stdio.h>
#include <string.h>
#include "MEM_guardedalloc.h"
diff --git a/source/blender/gpu/intern/gpu_node_graph.c b/source/blender/gpu/intern/gpu_node_graph.c
index bf91a5bbb4d..b220c60e979 100644
--- a/source/blender/gpu/intern/gpu_node_graph.c
+++ b/source/blender/gpu/intern/gpu_node_graph.c
@@ -23,6 +23,7 @@
* Intermediate node graph for generating GLSL shaders.
*/
+#include <stdio.h>
#include <string.h>
#include "MEM_guardedalloc.h"
diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c
index 106e4618847..b7b31b3e56a 100644
--- a/source/blender/imbuf/intern/thumbs_blend.c
+++ b/source/blender/imbuf/intern/thumbs_blend.c
@@ -18,6 +18,7 @@
* \ingroup imbuf
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c
index d089894a6e9..c3611488f5f 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -22,6 +22,7 @@
*/
#include <stddef.h>
+#include <stdio.h>
#include <string.h>
#include "MEM_guardedalloc.h"
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
index a9e24867351..ab5a265547d 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
@@ -18,6 +18,8 @@
* \ingroup wm
*/
+#include <stdio.h>
+
#include "BLI_ghash.h"
#include "BLI_utildefines.h"
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
index efd7a13d02a..185854b1ca0 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
@@ -18,6 +18,8 @@
* \ingroup wm
*/
+#include <stdio.h>
+
#include "BLI_ghash.h"
#include "BLI_listbase.h"
#include "BLI_utildefines.h"
diff --git a/source/blender/windowmanager/intern/wm_menu_type.c b/source/blender/windowmanager/intern/wm_menu_type.c
index 0c52e636e4d..bcaa2243f9f 100644
--- a/source/blender/windowmanager/intern/wm_menu_type.c
+++ b/source/blender/windowmanager/intern/wm_menu_type.c
@@ -20,6 +20,8 @@
* Menu Registry.
*/
+#include <stdio.h>
+
#include "BLI_sys_types.h"
#include "DNA_windowmanager_types.h"
diff --git a/source/blender/windowmanager/intern/wm_uilist_type.c b/source/blender/windowmanager/intern/wm_uilist_type.c
index ef6d855cb36..45c14c0bbe9 100644
--- a/source/blender/windowmanager/intern/wm_uilist_type.c
+++ b/source/blender/windowmanager/intern/wm_uilist_type.c
@@ -20,6 +20,8 @@
* UI List Registry.
*/
+#include <stdio.h>
+
#include "BLI_sys_types.h"
#include "DNA_windowmanager_types.h"
More information about the Bf-blender-cvs
mailing list