diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-19 13:16:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-19 13:16:05 +0300 |
| commit | 60956397ca46ae31f5fc1931a8a7fc98d4f1b699 (patch) | |
| tree | fbb92266d2b6ddbbcdcbcf3d5538d93036a1cbe2 /source/blender/blenlib | |
| parent | 215651af1b09571eaceafd1c4269d559eb5328ca (diff) | |
Cleanup: BLI_utildefines prefix for header-only libs
This allows to have different macro headers without them sharing
similar names to regular C modules.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_string_utils.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines_stack.h (renamed from source/blender/blenlib/BLI_stackdefines.h) | 8 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines_variadic.h (renamed from source/blender/blenlib/BLI_variadic_defines.h) | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenlib/BLI_string_utils.h b/source/blender/blenlib/BLI_string_utils.h index 63c1e0344ad..5701bce51ea 100644 --- 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; diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index ae2f948a284..66c7f247f61 100644 --- 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> diff --git a/source/blender/blenlib/BLI_stackdefines.h b/source/blender/blenlib/BLI_utildefines_stack.h index 42b11eb9a2b..15b0029e727 100644 --- a/source/blender/blenlib/BLI_stackdefines.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__ */ diff --git a/source/blender/blenlib/BLI_variadic_defines.h b/source/blender/blenlib/BLI_utildefines_variadic.h index a2ff8ee09e7..7c15754fd83 100644 --- a/source/blender/blenlib/BLI_variadic_defines.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__ */ |