Cleanup: BLI_utildefines prefix for header-only libs
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Sep 2017 10:16:05 +0000 (20:16 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Sep 2017 10:16:05 +0000 (20:16 +1000)
This allows to have different macro headers without them sharing
similar names to regular C modules.

23 files changed:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenlib/BLI_string_utils.h
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/BLI_utildefines_stack.h [moved from source/blender/blenlib/BLI_stackdefines.h with 96% similarity]
source/blender/blenlib/BLI_utildefines_variadic.h [moved from source/blender/blenlib/BLI_variadic_defines.h with 93% similarity]
source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_polygon_edgenet.c
source/blender/bmesh/intern/bmesh_queries.c
source/blender/bmesh/operators/bmo_bisect_plane.c
source/blender/bmesh/operators/bmo_connect.c
source/blender/bmesh/operators/bmo_offset_edgeloops.c
source/blender/bmesh/operators/bmo_removedoubles.c
source/blender/bmesh/operators/bmo_subdivide_edgering.c
source/blender/bmesh/tools/bmesh_bisect_plane.c
source/blender/bmesh/tools/bmesh_decimate_collapse.c
source/blender/bmesh/tools/bmesh_intersect.c
source/blender/bmesh/tools/bmesh_path_region.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/transform/transform.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/python/generic/py_capi_utils.h
tests/gtests/blenlib/BLI_array_utils_test.cc

index 16e9f3d67779a7f1a9904f7425d3ac98b752a5e1..0d59357a168f4bf3e9f8626263b3fef6c96a0976 100644 (file)
@@ -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"
index 63c1e0344adfdaee7469aa2e863d2381a97e8e2f..5701bce51ea14b2225cb06502d4c5a9b46c6a443 100644 (file)
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_variadic_defines.h"
+#include "BLI_utildefines_variadic.h"
 
 struct ListBase;
 
index ae2f948a2842e81a6b38ba35a514c9b1fbbbfaa7..66c7f247f61ab9f53a26583622bc5359e3d50e1d 100644 (file)
@@ -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>
similarity index 96%
rename from source/blender/blenlib/BLI_stackdefines.h
rename to source/blender/blenlib/BLI_utildefines_stack.h
index 42b11eb9a2b3dc5d1b7d4a0a744a24fcb570e6a8..15b0029e727a7db688f90f4eba41e7b5f7fdf89c 100644 (file)
  * ***** 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__ */
similarity index 93%
rename from source/blender/blenlib/BLI_variadic_defines.h
rename to source/blender/blenlib/BLI_utildefines_variadic.h
index a2ff8ee09e7d2d3bfa481dadc1eebb0655ce3e28..7c15754fd83953588ec4a32a1aeccca020be1376 100644 (file)
  * ***** 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__ */
index 6b22fd0a85cc66cfdecd3ff63beda3eee0003f30..c7ff93cf50482dfbd4d27b14ed072c538895d28e 100644 (file)
@@ -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"
 
index 1b35f049838470082bff598f4fd47ad63a562755..8a3cb3296105bcfc78df0b4f3b51a0e3fee31bf1 100644 (file)
@@ -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"
index 88f45c06c20b220a5fa77a7069bc50c03ee4d9dd..5bdc3927e162276d7c22c0d095e67c80dc61f258 100644 (file)
@@ -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"
 
index 2c80ff651b8303a19015e15bc40d067e17d9abc1..ed232e81b8263533689f50d4ebb4a79b24e924dc 100644 (file)
@@ -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"
index c5c4ac959a94f62f9948dda7dcc0866934be117f..0b5f1bb9ca186aa1d7843bad9ae0e8d5e9b9580d 100644 (file)
@@ -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"
 
index a9840a72fc978f06f503ada27f22f2dcca58fe67..269f933f27f4c87162da9ee30f4f6479953e2f79 100644 (file)
@@ -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"
 
index d8e6f250adf4aba8296f417f94848ead5cdf02bc..e85751531ae732784893c42b1fed6328e69963a1 100644 (file)
@@ -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"
index 94b60a51f6882c2d40594eefd52a16fd6e5e7e31..adcc0c71629ea48890480404fa91cf96182e5d37 100644 (file)
@@ -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"
index 676a8de94c86701ea253a0f1742d6125a53081ca..f3927a3ff67f48cd5e345f58c193ec034733b400 100644 (file)
@@ -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"
index c417131d588e61ef938f47f2a72338e8ab99efc4..36ae7231f944d048967b5c678672d99408040328 100644 (file)
@@ -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"
index b9408492cc11142a161a53dda6c605c11d34f2db..9d1b20cb4d24e201f56d1faeeef9e9b5400eaace 100644 (file)
@@ -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
index 27609ec3d48cd3063504e3d711fd5d7ba6c24783..d23ea537d82673fe937e2f155be8f34ebb51b438 100644 (file)
@@ -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"
index 19893c79db4f7e24c98d02140b6100b671d3cf41..584176e4b5d28cac6d1560594e8033bc080586c4 100644 (file)
@@ -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"
index 8cabf8d78ed8cee65f061088206e9b19aa1396a4..c2f04005e834982763cfab461d4d06044e463cc6 100644 (file)
@@ -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"
index 153670d327c5fba2c6be52847d79bcf5bfc19194..c2896e83a0bbf09c7f305e034e977b9c9d77f497 100644 (file)
@@ -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"
 
index 911b6997058e62edf4534a76487bd545eac633a6..e96771e0665f46329fdc4183911ee805bad5963f 100644 (file)
@@ -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"
 
index 053250a2a9504aca6c3939a8d59be2b1acd82563..327d4e60954f269d18b22ad5a6c2ed97ce1a247d 100644 (file)
@@ -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);
index 518cd097326403d8e8b17d4cd738e36ad26eb8bf..c4601e00fbde1bbb7d934dcde2f63604d081457f 100644 (file)
@@ -5,7 +5,7 @@
 extern "C" {
 #include "BLI_utildefines.h"
 #include "BLI_array_utils.h"
-#include "BLI_stackdefines.h"
+#include "BLI_utildefines_stack.h"
 }
 
 /* -------------------------------------------------------------------- */