Cleanup: BLI_utildefines prefix for header-only libs

This allows to have different macro headers without them sharing similar names to regular C modules.
2017-09-19 20:16:05 +10:00 · 2017-09-19 20:16:05 +10:00 · 60956397ca
commit 60956397ca
parent 215651af1b
23 changed files with 29 additions and 29 deletions
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@ -37,7 +37,7 @@
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
 #include "BLI_utildefines.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"

 #include "BKE_pbvh.h"
 #include "BKE_cdderivedmesh.h"
--- a/source/blender/blenlib/BLI_string_utils.h
+++ b/source/blender/blenlib/BLI_string_utils.h
@ -39,7 +39,7 @@ extern "C" {
 #endif

 #include "BLI_compiler_attrs.h"
-#include "BLI_variadic_defines.h"
+#include "BLI_utildefines_variadic.h"

 struct ListBase;

--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@ -39,7 +39,7 @@ extern "C" {
 /* avoid many includes for now */
 #include "BLI_sys_types.h"
 #include "BLI_compiler_compat.h"
-#include "BLI_variadic_defines.h"
+#include "BLI_utildefines_variadic.h"

 #ifndef NDEBUG /* for BLI_assert */
 #include <stdio.h>
--- a/source/blender/blenlib/BLI_utildefines_stack.h
+++ b/source/blender/blenlib/BLI_utildefines_stack.h
@ -18,10 +18,10 @@
 * ***** END GPL LICENSE BLOCK *****
 */

-#ifndef __BLI_STACKDEFINES_H__
-#define __BLI_STACKDEFINES_H__
+#ifndef __BLI_UTILDEFINES_STACK_H__
+#define __BLI_UTILDEFINES_STACK_H__

-/** \file BLI_stackdefines.h
+/** \file BLI_utildefines_stack.h
 *  \ingroup bli
 *
 * Macro's for a simple array based stack
@ -86,4 +86,4 @@
 	} ((void)0)
 #endif

-#endif  /* __BLI_STACKDEFINES_H__ */
+#endif  /* __BLI_UTILDEFINES_STACK_H__ */
--- a/source/blender/blenlib/BLI_utildefines_variadic.h
+++ b/source/blender/blenlib/BLI_utildefines_variadic.h
@ -18,10 +18,10 @@
 * ***** END GPL LICENSE BLOCK *****
 */

-#ifndef __BLI_VARIADIC_DEFINES_H__
-#define __BLI_VARIADIC_DEFINES_H__
+#ifndef __BLI_UTILDEFINES_VARIADIC_H__
+#define __BLI_UTILDEFINES_VARIADIC_H__

-/** \file BLI_variadic_defines.h
+/** \file BLI_utildefines_variadic.h
 *  \ingroup bli
 */

@ -47,4 +47,4 @@
 #define VA_NARGS_CALL_OVERLOAD(name, ...) \
 	_VA_NARGS_GLUE(_VA_NARGS_OVERLOAD_MACRO(name, VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__))

-#endif  /* __BLI_VARIADIC_DEFINES_H__ */
+#endif  /* __BLI_UTILDEFINES_VARIADIC_H__ */
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@ -32,7 +32,7 @@
 #include "BLI_array.h"
 #include "BLI_alloca.h"
 #include "BLI_linklist_stack.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"

 #include "BLT_translation.h"

--- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
+++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
@ -32,7 +32,7 @@
 #include "BLI_memarena.h"
 #include "BLI_array.h"
 #include "BLI_alloca.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_linklist_stack.h"
 #include "BLI_sort.h"
 #include "BLI_sort_utils.h"
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@ -36,7 +36,7 @@
 #include "BLI_math.h"
 #include "BLI_alloca.h"
 #include "BLI_linklist.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"

 #include "BKE_customdata.h"

--- a/source/blender/bmesh/operators/bmo_bisect_plane.c
+++ b/source/blender/bmesh/operators/bmo_bisect_plane.c
@ -29,7 +29,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_utildefines.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_math.h"

 #include "bmesh.h"
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@ -27,7 +27,7 @@
 */

 #include "BLI_utildefines.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_alloca.h"
 #include "BLI_linklist_stack.h"

--- a/source/blender/bmesh/operators/bmo_offset_edgeloops.c
+++ b/source/blender/bmesh/operators/bmo_offset_edgeloops.c
@ -33,7 +33,7 @@

 #include "BLI_math.h"
 #include "BLI_alloca.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"

 #include "BKE_customdata.h"

--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@ -31,7 +31,7 @@
 #include "BLI_math.h"
 #include "BLI_alloca.h"
 #include "BLI_kdtree.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_stack.h"

 #include "BKE_customdata.h"
--- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c
+++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
@ -40,7 +40,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_utildefines.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_alloca.h"
 #include "BLI_math.h"
 #include "BLI_listbase.h"
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@ -38,7 +38,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_utildefines.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_alloca.h"
 #include "BLI_linklist.h"
 #include "BLI_linklist_stack.h"
--- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
@ -40,7 +40,7 @@
 #include "BLI_edgehash.h"
 #include "BLI_polyfill2d.h"
 #include "BLI_polyfill2d_beautify.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"


 #include "BKE_customdata.h"
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@ -44,7 +44,7 @@
 #include "BLI_sort_utils.h"

 #include "BLI_linklist_stack.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #ifndef NDEBUG
 #  include "BLI_array_utils.h"
 #endif
--- a/source/blender/bmesh/tools/bmesh_path_region.c
+++ b/source/blender/bmesh/tools/bmesh_path_region.c
@ -29,7 +29,7 @@

 #include "BLI_math.h"
 #include "BLI_linklist.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_alloca.h"

 #include "bmesh.h"
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@ -50,7 +50,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 #include "BLI_linklist_stack.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"


 #include "BKE_context.h"
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@ -51,7 +51,7 @@
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_ghash.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_memarena.h"

 #include "BKE_nla.h"
--- a/source/blender/modifiers/intern/MOD_laplaciandeform.c
+++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c
@ -29,7 +29,7 @@
 */

 #include "BLI_utildefines.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_math.h"
 #include "BLI_string.h"

--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@ -36,7 +36,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_utildefines.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 #include "BLI_bitmap.h"
 #include "BLI_math.h"

--- a/source/blender/python/generic/py_capi_utils.h
+++ b/source/blender/python/generic/py_capi_utils.h
@ -28,7 +28,7 @@
 #define __PY_CAPI_UTILS_H__

 #include "BLI_sys_types.h"
-#include "BLI_variadic_defines.h"
+#include "BLI_utildefines_variadic.h"

 void			PyC_ObSpit(const char *name, PyObject *var);
 void			PyC_LineSpit(void);
--- a/tests/gtests/blenlib/BLI_array_utils_test.cc
+++ b/tests/gtests/blenlib/BLI_array_utils_test.cc
@ -5,7 +5,7 @@
 extern "C" {
 #include "BLI_utildefines.h"
 #include "BLI_array_utils.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 }

 /* -------------------------------------------------------------------- */