diff options
Diffstat (limited to 'source/blender/blenlib')
75 files changed, 177 insertions, 177 deletions
diff --git a/source/blender/blenlib/BLI_allocator.h b/source/blender/blenlib/BLI_allocator.h index 075c181833c..e2d39c4e897 100644 --- a/source/blender/blenlib/BLI_allocator.h +++ b/source/blender/blenlib/BLI_allocator.h @@ -29,13 +29,13 @@ * job good enough. */ -#include <stdlib.h> #include <algorithm> +#include <stdlib.h> #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_array_cxx.h b/source/blender/blenlib/BLI_array_cxx.h index adb00c95f28..8fc2aec6698 100644 --- a/source/blender/blenlib/BLI_array_cxx.h +++ b/source/blender/blenlib/BLI_array_cxx.h @@ -23,11 +23,11 @@ * a template argument. Instead it can be specified at the construction time. */ -#include "BLI_utildefines.h" #include "BLI_allocator.h" #include "BLI_array_ref.h" -#include "BLI_memory_utils_cxx.h" #include "BLI_index_range.h" +#include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_array_ref.h b/source/blender/blenlib/BLI_array_ref.h index 6cc96cedc83..2c2e441a47d 100644 --- a/source/blender/blenlib/BLI_array_ref.h +++ b/source/blender/blenlib/BLI_array_ref.h @@ -35,15 +35,15 @@ * Since array references do not own any memory, it is generally not save to store them. */ -#include <vector> -#include <array> #include <algorithm> +#include <array> #include <iostream> #include <string> +#include <vector> -#include "BLI_utildefines.h" -#include "BLI_memory_utils_cxx.h" #include "BLI_index_range.h" +#include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_hash_cxx.h b/source/blender/blenlib/BLI_hash_cxx.h index a369774a471..22941a792ba 100644 --- a/source/blender/blenlib/BLI_hash_cxx.h +++ b/source/blender/blenlib/BLI_hash_cxx.h @@ -25,12 +25,12 @@ */ #include <functional> +#include <memory> #include <string> #include <utility> -#include <memory> -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_index_range.h b/source/blender/blenlib/BLI_index_range.h index f67cc259227..4553c996454 100644 --- a/source/blender/blenlib/BLI_index_range.h +++ b/source/blender/blenlib/BLI_index_range.h @@ -25,8 +25,8 @@ * cases, a separate data structure should be used. */ -#include <cmath> #include <algorithm> +#include <cmath> #include <iostream> #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/BLI_map.h b/source/blender/blenlib/BLI_map.h index 6971f9d362e..4b7ac0791d9 100644 --- a/source/blender/blenlib/BLI_map.h +++ b/source/blender/blenlib/BLI_map.h @@ -26,8 +26,8 @@ * lookups. Keys and values are stored in groups of four to avoid wasting memory due to padding. */ -#include "BLI_hash_cxx.h" #include "BLI_array_ref.h" +#include "BLI_hash_cxx.h" #include "BLI_open_addressing.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_math.h b/source/blender/blenlib/BLI_math.h index c19fb7e0e85..f8de8b7ed53 100644 --- a/source/blender/blenlib/BLI_math.h +++ b/source/blender/blenlib/BLI_math.h @@ -66,12 +66,12 @@ #include "BLI_math_base.h" #include "BLI_math_color.h" -#include "BLI_math_matrix.h" -#include "BLI_math_rotation.h" -#include "BLI_math_vector.h" #include "BLI_math_geom.h" #include "BLI_math_interp.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_solvers.h" #include "BLI_math_statistics.h" +#include "BLI_math_vector.h" #endif /* __BLI_MATH_H__ */ diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index ef76958f269..7a9d17d2b05 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -31,9 +31,9 @@ # define _USE_MATH_DEFINES #endif -#include <math.h> #include "BLI_assert.h" #include "BLI_math_inline.h" +#include <math.h> #ifndef M_PI # define M_PI 3.14159265358979323846 /* pi */ diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h index 9f5be292dd8..fb4a79a491b 100644 --- a/source/blender/blenlib/BLI_memiter.h +++ b/source/blender/blenlib/BLI_memiter.h @@ -25,9 +25,9 @@ extern "C" { #endif -#include "BLI_sys_types.h" #include "BLI_compiler_attrs.h" #include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" /* 512kb, good default for small elems. */ #define BLI_MEMITER_DEFAULT_SIZE (1 << 19) diff --git a/source/blender/blenlib/BLI_memory_utils_cxx.h b/source/blender/blenlib/BLI_memory_utils_cxx.h index 35b08f804cb..6534138315d 100644 --- a/source/blender/blenlib/BLI_memory_utils_cxx.h +++ b/source/blender/blenlib/BLI_memory_utils_cxx.h @@ -21,8 +21,8 @@ * \ingroup bli */ -#include <memory> #include <algorithm> +#include <memory> #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/BLI_open_addressing.h b/source/blender/blenlib/BLI_open_addressing.h index a238902c631..6a0acd418eb 100644 --- a/source/blender/blenlib/BLI_open_addressing.h +++ b/source/blender/blenlib/BLI_open_addressing.h @@ -33,10 +33,10 @@ #include <cmath> -#include "BLI_utildefines.h" -#include "BLI_memory_utils_cxx.h" -#include "BLI_math_base.h" #include "BLI_allocator.h" +#include "BLI_math_base.h" +#include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_optional.h b/source/blender/blenlib/BLI_optional.h index 90bded604ea..267c858e0f2 100644 --- a/source/blender/blenlib/BLI_optional.h +++ b/source/blender/blenlib/BLI_optional.h @@ -23,8 +23,8 @@ #ifndef __BLI_OPTIONAL_H__ #define __BLI_OPTIONAL_H__ -#include "BLI_utildefines.h" #include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" #include <algorithm> #include <memory> diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index 2b11213d351..b1faae03583 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -24,9 +24,9 @@ * \ingroup bli */ -#include "DNA_vec_types.h" -#include "BLI_sys_types.h" /* bool */ #include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" /* bool */ +#include "DNA_vec_types.h" struct rctf; struct rcti; diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index 7c8290439c6..6d3f38c7a52 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -24,8 +24,8 @@ * \ingroup bli */ -#include <stdarg.h> #include <inttypes.h> +#include <stdarg.h> #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_string_map.h b/source/blender/blenlib/BLI_string_map.h index 2f09e489a7a..ed97a6ae349 100644 --- a/source/blender/blenlib/BLI_string_map.h +++ b/source/blender/blenlib/BLI_string_map.h @@ -28,9 +28,9 @@ * a special map with string keys can be quite handy. */ #include "BLI_map.h" +#include "BLI_optional.h" #include "BLI_string_ref.h" #include "BLI_vector.h" -#include "BLI_optional.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_string_ref.h b/source/blender/blenlib/BLI_string_ref.h index 54c2f0e7209..2389542bcea 100644 --- a/source/blender/blenlib/BLI_string_ref.h +++ b/source/blender/blenlib/BLI_string_ref.h @@ -29,11 +29,11 @@ */ #include <cstring> -#include <string> #include <sstream> +#include <string> -#include "BLI_utildefines.h" #include "BLI_array_ref.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index 354d27385a2..b9e799aa2a9 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -64,13 +64,13 @@ typedef uint64_t u_int64_t; #else /* FreeBSD, Solaris */ -# include <sys/types.h> # include <stdint.h> +# include <sys/types.h> #endif /* ifdef platform for types */ -#include <stddef.h> /* size_t define */ #include <stdbool.h> +#include <stddef.h> /* size_t define */ #ifndef __cplusplus # if defined(__APPLE__) diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 3565b6fb26b..fb5dbf66819 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -29,8 +29,8 @@ extern "C" { #endif /* avoid many includes for now */ -#include "BLI_sys_types.h" #include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" #include "BLI_utildefines_variadic.h" /* We could remove in future. */ diff --git a/source/blender/blenlib/BLI_vector.h b/source/blender/blenlib/BLI_vector.h index 60251347795..6a708759d0e 100644 --- a/source/blender/blenlib/BLI_vector.h +++ b/source/blender/blenlib/BLI_vector.h @@ -31,13 +31,13 @@ #include <iostream> #include <memory> -#include "BLI_utildefines.h" -#include "BLI_memory_utils_cxx.h" +#include "BLI_allocator.h" #include "BLI_array_ref.h" +#include "BLI_index_range.h" #include "BLI_listbase_wrapper.h" #include "BLI_math_base.h" -#include "BLI_allocator.h" -#include "BLI_index_range.h" +#include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/PIL_time_utildefines.h b/source/blender/blenlib/PIL_time_utildefines.h index 198b6d1bb21..ffe753badf8 100644 --- a/source/blender/blenlib/PIL_time_utildefines.h +++ b/source/blender/blenlib/PIL_time_utildefines.h @@ -25,8 +25,8 @@ #ifndef __PIL_TIME_UTILDEFINES_H__ #define __PIL_TIME_UTILDEFINES_H__ -#include "PIL_time.h" /* for PIL_check_seconds_timer */ #include "BLI_utildefines.h" /* for AT */ +#include "PIL_time.h" /* for PIL_check_seconds_timer */ #define TIMEIT_START(var) \ { \ diff --git a/source/blender/blenlib/intern/BLI_args.c b/source/blender/blenlib/intern/BLI_args.c index 8f282373cf5..2b078b3bae5 100644 --- a/source/blender/blenlib/intern/BLI_args.c +++ b/source/blender/blenlib/intern/BLI_args.c @@ -27,11 +27,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" -#include "BLI_string.h" #include "BLI_args.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" static char NO_DOCS[] = "NO DOCUMENTATION SPECIFIED"; diff --git a/source/blender/blenlib/intern/BLI_dynstr.c b/source/blender/blenlib/intern/BLI_dynstr.c index c325c010330..3e80f791fa5 100644 --- a/source/blender/blenlib/intern/BLI_dynstr.c +++ b/source/blender/blenlib/intern/BLI_dynstr.c @@ -25,11 +25,11 @@ #include <stdlib.h> /* malloc */ #include <string.h> -#include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_dynstr.h" #include "BLI_memarena.h" #include "BLI_string.h" -#include "BLI_dynstr.h" +#include "BLI_utildefines.h" +#include "MEM_guardedalloc.h" #ifdef _WIN32 # ifndef vsnprintf diff --git a/source/blender/blenlib/intern/BLI_filelist.c b/source/blender/blenlib/intern/BLI_filelist.c index a3b745fd63e..2e402f0c063 100644 --- a/source/blender/blenlib/intern/BLI_filelist.c +++ b/source/blender/blenlib/intern/BLI_filelist.c @@ -18,27 +18,27 @@ * \ingroup bli */ -#include <sys/types.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #ifndef WIN32 # include <dirent.h> #endif -#include <time.h> -#include <sys/stat.h> #include <string.h> /* strcpy etc.. */ +#include <sys/stat.h> +#include <time.h> #ifdef WIN32 -# include <io.h> -# include <direct.h> # include "BLI_winstuff.h" # include "utfconv.h" +# include <direct.h> +# include <io.h> #else +# include <pwd.h> # include <sys/ioctl.h> # include <unistd.h> -# include <pwd.h> #endif /* lib includes */ @@ -46,11 +46,11 @@ #include "DNA_listBase.h" -#include "BLI_listbase.h" -#include "BLI_string.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" +#include "BLI_string.h" #include "../imbuf/IMB_imbuf.h" diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 64863cac15f..0800027e520 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -24,16 +24,16 @@ * for 'Abstract Data Types' (known as an ADT Hash Table). */ -#include <string.h> -#include <stdlib.h> -#include <stdarg.h> #include <limits.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> #include "MEM_guardedalloc.h" +#include "BLI_mempool.h" #include "BLI_sys_types.h" /* for intptr_t support */ #include "BLI_utildefines.h" -#include "BLI_mempool.h" #define GHASH_INTERNAL_API #include "BLI_ghash.h" /* own include */ diff --git a/source/blender/blenlib/intern/BLI_ghash_utils.c b/source/blender/blenlib/intern/BLI_ghash_utils.c index abe5970b9a6..83bf0373ae7 100644 --- a/source/blender/blenlib/intern/BLI_ghash_utils.c +++ b/source/blender/blenlib/intern/BLI_ghash_utils.c @@ -28,9 +28,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_hash_mm2a.h" #include "BLI_ghash.h" /* own include */ +#include "BLI_hash_mm2a.h" +#include "BLI_utildefines.h" /* keep last */ #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c index 88b7f83385c..f8d78213980 100644 --- a/source/blender/blenlib/intern/BLI_heap.c +++ b/source/blender/blenlib/intern/BLI_heap.c @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_heap.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" /***/ diff --git a/source/blender/blenlib/intern/BLI_heap_simple.c b/source/blender/blenlib/intern/BLI_heap_simple.c index 6b27799b808..a7a71512875 100644 --- a/source/blender/blenlib/intern/BLI_heap_simple.c +++ b/source/blender/blenlib/intern/BLI_heap_simple.c @@ -29,9 +29,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_heap_simple.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" #define HEAP_PARENT(i) (((i)-1) >> 1) diff --git a/source/blender/blenlib/intern/BLI_index_range.cc b/source/blender/blenlib/intern/BLI_index_range.cc index 6421eb0794b..90eb4e4a89c 100644 --- a/source/blender/blenlib/intern/BLI_index_range.cc +++ b/source/blender/blenlib/intern/BLI_index_range.cc @@ -17,9 +17,9 @@ #include <atomic> #include <mutex> -#include "BLI_index_range.h" -#include "BLI_array_ref.h" #include "BLI_array_cxx.h" +#include "BLI_array_ref.h" +#include "BLI_index_range.h" #include "BLI_vector.h" namespace BLI { diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 50381f2fb18..3a07cef7cac 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -42,13 +42,13 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_stack.h" +#include "BLI_heap_simple.h" #include "BLI_kdopbvh.h" #include "BLI_math.h" +#include "BLI_stack.h" #include "BLI_task.h" -#include "BLI_heap_simple.h" +#include "BLI_utildefines.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/BLI_linklist.c b/source/blender/blenlib/intern/BLI_linklist.c index 0fe9fd62198..5020e06d0b3 100644 --- a/source/blender/blenlib/intern/BLI_linklist.c +++ b/source/blender/blenlib/intern/BLI_linklist.c @@ -30,10 +30,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_memarena.h" #include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/BLI_memarena.c b/source/blender/blenlib/intern/BLI_memarena.c index b20a0eafd74..fd2367aa992 100644 --- a/source/blender/blenlib/intern/BLI_memarena.c +++ b/source/blender/blenlib/intern/BLI_memarena.c @@ -34,9 +34,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_memarena.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" #ifdef WITH_MEM_VALGRIND # include "valgrind/memcheck.h" diff --git a/source/blender/blenlib/intern/BLI_memblock.c b/source/blender/blenlib/intern/BLI_memblock.c index b532202ebaa..2fbdfbe8a95 100644 --- a/source/blender/blenlib/intern/BLI_memblock.c +++ b/source/blender/blenlib/intern/BLI_memblock.c @@ -24,8 +24,8 @@ * */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "atomic_ops.h" diff --git a/source/blender/blenlib/intern/BLI_memiter.c b/source/blender/blenlib/intern/BLI_memiter.c index 4027a62bbcc..017f08f8d35 100644 --- a/source/blender/blenlib/intern/BLI_memiter.c +++ b/source/blender/blenlib/intern/BLI_memiter.c @@ -37,8 +37,8 @@ * but tests show this doesn't give noticeable speedup. */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index 4182aab2190..e5868abbe2c 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -29,8 +29,8 @@ * (optionally when using the #BLI_MEMPOOL_ALLOW_ITER flag). */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "atomic_ops.h" diff --git a/source/blender/blenlib/intern/DLRB_tree.c b/source/blender/blenlib/intern/DLRB_tree.c index 7917730cd6a..6810601d527 100644 --- a/source/blender/blenlib/intern/DLRB_tree.c +++ b/source/blender/blenlib/intern/DLRB_tree.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BLI_dlrbTree.h" +#include "BLI_listbase.h" /* *********************************************** */ /* Tree API */ diff --git a/source/blender/blenlib/intern/array_utils.c b/source/blender/blenlib/intern/array_utils.c index 25bcf7136f7..5dec10a5756 100644 --- a/source/blender/blenlib/intern/array_utils.c +++ b/source/blender/blenlib/intern/array_utils.c @@ -22,16 +22,16 @@ * and only included for the cases where the performance is acceptable. * Use with care. */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "BLI_array_utils.h" +#include "BLI_alloca.h" #include "BLI_sys_types.h" #include "BLI_utildefines.h" -#include "BLI_alloca.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/astar.c b/source/blender/blenlib/intern/astar.c index c8f2160f0b6..1f71a62d191 100644 --- a/source/blender/blenlib/intern/astar.c +++ b/source/blender/blenlib/intern/astar.c @@ -43,8 +43,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_sys_types.h" #include "BLI_compiler_attrs.h" +#include "BLI_sys_types.h" #include "BLI_heap_simple.h" #include "BLI_listbase.h" diff --git a/source/blender/blenlib/intern/bitmap.c b/source/blender/blenlib/intern/bitmap.c index 4e26ae23774..d24047397fb 100644 --- a/source/blender/blenlib/intern/bitmap.c +++ b/source/blender/blenlib/intern/bitmap.c @@ -23,11 +23,11 @@ * Utility functions for variable size bitmasks. */ -#include <string.h> #include <limits.h> +#include <string.h> -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_utildefines.h" /** Set or clear all bits in the bitmap. */ void BLI_bitmap_set_all(BLI_bitmap *bitmap, bool set, size_t bits) diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c index c0c4613daf4..6ecadeecec5 100644 --- a/source/blender/blenlib/intern/boxpack_2d.c +++ b/source/blender/blenlib/intern/boxpack_2d.c @@ -18,14 +18,14 @@ * \ingroup bli */ -#include <stdlib.h> /* for qsort */ #include <math.h> /* for fabsf */ +#include <stdlib.h> /* for qsort */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_boxpack_2d.h" /* own include */ +#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLI_sort.h" /* qsort_r */ #define qsort_r BLI_qsort_r diff --git a/source/blender/blenlib/intern/dynlib.c b/source/blender/blenlib/intern/dynlib.c index 2aceff45b3e..a555098698b 100644 --- a/source/blender/blenlib/intern/dynlib.c +++ b/source/blender/blenlib/intern/dynlib.c @@ -35,9 +35,9 @@ struct DynamicLibrary { #ifdef WIN32 # define WIN32_LEAN_AND_MEAN -# include <windows.h> # include "utf_winfunc.h" # include "utfconv.h" +# include <windows.h> DynamicLibrary *BLI_dynlib_open(const char *name) { diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c index 9b846dfa08d..556c0a65fc5 100644 --- a/source/blender/blenlib/intern/edgehash.c +++ b/source/blender/blenlib/intern/edgehash.c @@ -23,15 +23,15 @@ * \note The API matches BLI_ghash.c, but the implementation is different. */ +#include <limits.h> #include <stdlib.h> #include <string.h> -#include <limits.h> #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" typedef struct _EdgeHash_Edge Edge; typedef struct _EdgeHash_Entry EdgeHashEntry; diff --git a/source/blender/blenlib/intern/endian_switch.c b/source/blender/blenlib/intern/endian_switch.c index 09d1d3d0774..7e316d930a0 100644 --- a/source/blender/blenlib/intern/endian_switch.c +++ b/source/blender/blenlib/intern/endian_switch.c @@ -18,9 +18,9 @@ * \ingroup bli */ +#include "BLI_endian_switch.h" #include "BLI_sys_types.h" #include "BLI_utildefines.h" -#include "BLI_endian_switch.h" void BLI_endian_switch_int16_array(short *val, const int size) { diff --git a/source/blender/blenlib/intern/expr_pylike_eval.c b/source/blender/blenlib/intern/expr_pylike_eval.c index 6020dc41a62..d1d84dab3f7 100644 --- a/source/blender/blenlib/intern/expr_pylike_eval.c +++ b/source/blender/blenlib/intern/expr_pylike_eval.c @@ -41,21 +41,21 @@ * The implementation has no global state and can be used multi-threaded. */ +#include <ctype.h> +#include <fenv.h> +#include <float.h> #include <math.h> -#include <stdio.h> #include <stddef.h> -#include <string.h> -#include <float.h> -#include <ctype.h> +#include <stdio.h> #include <stdlib.h> -#include <fenv.h> +#include <string.h> #include "MEM_guardedalloc.h" +#include "BLI_alloca.h" #include "BLI_expr_pylike_eval.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" -#include "BLI_alloca.h" +#include "BLI_utildefines.h" #ifdef _MSC_VER # pragma fenv_access(on) diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index afb46dd8d82..da77046547c 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -24,42 +24,42 @@ #include <stdlib.h> /* malloc */ #include <string.h> -#include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> #include <errno.h> #include "zlib.h" #ifdef WIN32 -# include <windows.h> -# include <shellapi.h> -# include <shobjidl.h> -# include <io.h> -# include "BLI_winstuff.h" # include "BLI_fileops_types.h" +# include "BLI_winstuff.h" # include "utf_winfunc.h" # include "utfconv.h" +# include <io.h> +# include <shellapi.h> +# include <shobjidl.h> +# include <windows.h> #else # if defined(__APPLE__) # include <CoreFoundation/CoreFoundation.h> -# include <objc/runtime.h> # include <objc/message.h> +# include <objc/runtime.h> # endif -# include <sys/param.h> # include <dirent.h> -# include <unistd.h> +# include <sys/param.h> # include <sys/wait.h> +# include <unistd.h> #endif #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" +#include "BLI_path_util.h" +#include "BLI_string.h" #include "BLI_sys_types.h" // for intptr_t support +#include "BLI_utildefines.h" #if 0 /* UNUSED */ /* gzip the file in from and write it to "to". diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index b5a950d6851..34886054cb0 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -35,16 +35,16 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_vfontdata.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" -#include "BLI_string.h" +#include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" +#include "BLI_vfontdata.h" -#include "DNA_vfont_types.h" -#include "DNA_packedFile_types.h" #include "DNA_curve_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_vfont_types.h" /* local variables */ static FT_Library library; diff --git a/source/blender/blenlib/intern/gsqueue.c b/source/blender/blenlib/intern/gsqueue.c index 5e1fbf6eade..36040536cac 100644 --- a/source/blender/blenlib/intern/gsqueue.c +++ b/source/blender/blenlib/intern/gsqueue.c @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_gsqueue.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" /* target chunk size: 64kb */ #define CHUNK_SIZE_DEFAULT (1 << 16) diff --git a/source/blender/blenlib/intern/hash_md5.c b/source/blender/blenlib/intern/hash_md5.c index 5ec1c91a735..8c869ce28c3 100644 --- a/source/blender/blenlib/intern/hash_md5.c +++ b/source/blender/blenlib/intern/hash_md5.c @@ -24,9 +24,9 @@ * according to the definition of MD5 in RFC 1321 from April 1992. */ +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> #include <sys/types.h> #include "BLI_hash_md5.h" /* own include */ diff --git a/source/blender/blenlib/intern/hash_mm3.c b/source/blender/blenlib/intern/hash_mm3.c index 0dfb7ff414c..e557789a5fd 100644 --- a/source/blender/blenlib/intern/hash_mm3.c +++ b/source/blender/blenlib/intern/hash_mm3.c @@ -26,8 +26,8 @@ * domain. The author hereby disclaims copyright to this source code. */ -#include "BLI_compiler_compat.h" #include "BLI_compiler_attrs.h" +#include "BLI_compiler_compat.h" #include "BLI_hash_mm3.h" /* own include */ #if defined(_MSC_VER) diff --git a/source/blender/blenlib/intern/jitter_2d.c b/source/blender/blenlib/intern/jitter_2d.c index aed43657b3f..a5b13caf985 100644 --- a/source/blender/blenlib/intern/jitter_2d.c +++ b/source/blender/blenlib/intern/jitter_2d.c @@ -22,12 +22,12 @@ * \brief Jitter offset table */ +#include "MEM_guardedalloc.h" #include <math.h> #include <string.h> -#include "MEM_guardedalloc.h" -#include "BLI_rand.h" #include "BLI_jitter_2d.h" +#include "BLI_rand.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/kdtree_impl.h b/source/blender/blenlib/intern/kdtree_impl.h index 9e11ea903c2..58261e4f6aa 100644 --- a/source/blender/blenlib/intern/kdtree_impl.h +++ b/source/blender/blenlib/intern/kdtree_impl.h @@ -20,10 +20,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_kdtree_impl.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" #define _CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) MACRO_ARG1##MACRO_ARG2 #define _CONCAT(MACRO_ARG1, MACRO_ARG2) _CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index e43c4b07a87..892eca768b3 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -25,8 +25,8 @@ * For single linked lists see 'BLI_linklist.h' */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index a293695154a..c4b68e9164c 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -28,9 +28,9 @@ #define __MATH_BASE_INLINE_C__ #include <float.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> -#include <limits.h> #ifdef __SSE2__ # include <emmintrin.h> diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index d5f4a793ad0..9e398239bc7 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -23,8 +23,8 @@ * \ingroup bli */ -#include <assert.h> #include "BLI_math.h" +#include <assert.h> #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index cc8042316f8..a91cdabe3ab 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -23,8 +23,8 @@ * \ingroup bli */ -#include <assert.h> #include "BLI_math.h" +#include <assert.h> #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 4a1f2ac2a8f..0bb2ba5859b 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -22,18 +22,18 @@ * \ingroup bli */ +#include <assert.h> #include <ctype.h> -#include <string.h> #include <stdlib.h> -#include <assert.h> +#include <string.h> #include "DNA_listBase.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" +#include "BLI_fnmatch.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "BLI_fnmatch.h" +#include "BLI_utildefines.h" #ifdef WIN32 # include "utf_winfunc.h" @@ -43,10 +43,10 @@ # undef _WIN32_IE # endif # define _WIN32_IE 0x0501 -# include <windows.h> -# include <shlobj.h> -# include "BLI_winstuff.h" # include "BLI_alloca.h" +# include "BLI_winstuff.h" +# include <shlobj.h> +# include <windows.h> #else # include "unistd.h" #endif /* WIN32 */ diff --git a/source/blender/blenlib/intern/polyfill_2d.c b/source/blender/blenlib/intern/polyfill_2d.c index 31b18079c73..90a4a4f4c2d 100644 --- a/source/blender/blenlib/intern/polyfill_2d.c +++ b/source/blender/blenlib/intern/polyfill_2d.c @@ -43,11 +43,11 @@ * No globals - keep threadsafe. */ -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BLI_memarena.h" #include "BLI_alloca.h" +#include "BLI_memarena.h" #include "BLI_polyfill_2d.h" /* own include */ diff --git a/source/blender/blenlib/intern/polyfill_2d_beautify.c b/source/blender/blenlib/intern/polyfill_2d_beautify.c index ab397b86b1a..41364c5a3a9 100644 --- a/source/blender/blenlib/intern/polyfill_2d_beautify.c +++ b/source/blender/blenlib/intern/polyfill_2d_beautify.c @@ -34,11 +34,11 @@ * No globals - keep threadsafe. */ -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BLI_memarena.h" #include "BLI_heap.h" +#include "BLI_memarena.h" #include "BLI_polyfill_2d_beautify.h" /* own include */ diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c index 9f47ada47d1..ab7a972e010 100644 --- a/source/blender/blenlib/intern/rand.c +++ b/source/blender/blenlib/intern/rand.c @@ -21,22 +21,22 @@ * \ingroup bli */ +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include <time.h> #include "MEM_guardedalloc.h" -#include "BLI_threads.h" -#include "BLI_rand.h" #include "BLI_math.h" +#include "BLI_rand.h" +#include "BLI_threads.h" /* defines BLI_INLINE */ #include "BLI_compiler_compat.h" -#include "BLI_sys_types.h" #include "BLI_strict_flags.h" +#include "BLI_sys_types.h" #define MULTIPLIER 0x5DEECE66Dll #define MASK 0x0000FFFFFFFFFFFFll diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index 2ed7d7d7345..ad8443683f8 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -23,12 +23,12 @@ * A minimalist lib for functions doing stuff with rectangle structs. */ -#include <stdlib.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <stdlib.h> -#include <limits.h> #include <float.h> +#include <limits.h> #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index c9b0eb3ed5e..4723a3532ac 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -31,11 +31,11 @@ * which uses ear clipping, but has no hole support. */ -#include <stdio.h> +#include <limits.h> #include <math.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <limits.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c index 0c4151e6575..31b2bf85142 100644 --- a/source/blender/blenlib/intern/scanfill_utils.c +++ b/source/blender/blenlib/intern/scanfill_utils.c @@ -18,18 +18,18 @@ * \ingroup bli */ -#include <stdio.h> +#include <limits.h> #include <math.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <limits.h> #include "MEM_guardedalloc.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "BLI_scanfill.h" /* own include */ diff --git a/source/blender/blenlib/intern/smallhash.c b/source/blender/blenlib/intern/smallhash.c index d5fdf003aef..6d1ce3c84cd 100644 --- a/source/blender/blenlib/intern/smallhash.c +++ b/source/blender/blenlib/intern/smallhash.c @@ -44,8 +44,8 @@ * use the maximum values to avoid real pointers colliding with magic numbers. */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "BLI_sys_types.h" diff --git a/source/blender/blenlib/intern/stack.c b/source/blender/blenlib/intern/stack.c index 301675c026e..e75d944c764 100644 --- a/source/blender/blenlib/intern/stack.c +++ b/source/blender/blenlib/intern/stack.c @@ -18,8 +18,8 @@ * \ingroup bli */ -#include <string.h> #include <stdlib.h> /* abort() */ +#include <string.h> #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index de16960eb85..da80777e6d6 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -23,9 +23,9 @@ * Some really low-level file operations. */ -#include <sys/types.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include <sys/stat.h> @@ -38,8 +38,8 @@ #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ defined(__DragonFly__) /* For statfs */ -# include <sys/param.h> # include <sys/mount.h> +# include <sys/param.h> #endif #if defined(__linux__) || defined(__hpux) || defined(__GNU__) || defined(__GLIBC__) @@ -50,26 +50,26 @@ #include <string.h> /* strcpy etc.. */ #ifdef WIN32 -# include <io.h> -# include <direct.h> -# include <stdbool.h> -# include "BLI_winstuff.h" # include "BLI_string_utf8.h" +# include "BLI_winstuff.h" # include "utfconv.h" +# include <direct.h> +# include <io.h> +# include <stdbool.h> #else +# include <pwd.h> # include <sys/ioctl.h> # include <unistd.h> -# include <pwd.h> #endif /* lib includes */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_linklist.h" -#include "BLI_string.h" #include "BLI_fileops.h" +#include "BLI_linklist.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" /** * Copies the current working directory into *dir (max size maxncpy), and diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index db97cd3b065..ef137c4459e 100644 --- a/source/blender/blenlib/intern/string.c +++ b/source/blender/blenlib/intern/string.c @@ -21,12 +21,12 @@ * \ingroup bli */ -#include <string.h> -#include <stdlib.h> -#include <stdarg.h> #include <ctype.h> -#include <math.h> #include <inttypes.h> +#include <math.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/string_cursor_utf8.c b/source/blender/blenlib/intern/string_cursor_utf8.c index ee4c11b1c04..90fde02b11f 100644 --- a/source/blender/blenlib/intern/string_cursor_utf8.c +++ b/source/blender/blenlib/intern/string_cursor_utf8.c @@ -24,8 +24,8 @@ #include <stdio.h> #include <stdlib.h> -#include "BLI_utildefines.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" #include "BLI_string_cursor_utf8.h" /* own include */ diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c index bf08ad6975b..e9fdce83710 100644 --- a/source/blender/blenlib/intern/string_utf8.c +++ b/source/blender/blenlib/intern/string_utf8.c @@ -23,12 +23,12 @@ * \ingroup bli */ +#include <stdio.h> +#include <stdlib.h> #include <string.h> #include <wchar.h> #include <wctype.h> #include <wcwidth.h> -#include <stdio.h> -#include <stdlib.h> #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/string_utils.c b/source/blender/blenlib/intern/string_utils.c index a579327c73e..fb9530b5cb5 100644 --- a/source/blender/blenlib/intern/string_utils.c +++ b/source/blender/blenlib/intern/string_utils.c @@ -22,8 +22,8 @@ */ #include <ctype.h> -#include <string.h> #include <stdlib.h> +#include <string.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c index 941c2b608e6..7d9ed2598a6 100644 --- a/source/blender/blenlib/intern/system.c +++ b/source/blender/blenlib/intern/system.c @@ -22,10 +22,10 @@ #include <stdio.h> #include <stdlib.h> -#include "BLI_utildefines.h" #include "BLI_math_base.h" -#include "BLI_system.h" #include "BLI_string.h" +#include "BLI_system.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 3c87df55b2b..95a63ae5c4e 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -21,14 +21,14 @@ * \ingroup bli */ -#include <stdlib.h> #include <errno.h> +#include <stdlib.h> #include <string.h> #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BLI_gsqueue.h" +#include "BLI_listbase.h" #include "BLI_system.h" #include "BLI_task.h" #include "BLI_threads.h" @@ -37,14 +37,14 @@ /* for checking system threads - BLI_system_thread_count */ #ifdef WIN32 -# include <windows.h> # include <sys/timeb.h> +# include <windows.h> #elif defined(__APPLE__) -# include <sys/types.h> # include <sys/sysctl.h> +# include <sys/types.h> #else -# include <unistd.h> # include <sys/time.h> +# include <unistd.h> #endif #include "atomic_ops.h" diff --git a/source/blender/blenlib/intern/time.c b/source/blender/blenlib/intern/time.c index 81b079a1f77..299c40d2cc3 100644 --- a/source/blender/blenlib/intern/time.c +++ b/source/blender/blenlib/intern/time.c @@ -74,8 +74,8 @@ void PIL_sleep_ms(int ms) #else -# include <unistd.h> # include <sys/time.h> +# include <unistd.h> double PIL_check_seconds_timer(void) { diff --git a/source/blender/blenlib/intern/timecode.c b/source/blender/blenlib/intern/timecode.c index 228f656949c..510b9651961 100644 --- a/source/blender/blenlib/intern/timecode.c +++ b/source/blender/blenlib/intern/timecode.c @@ -25,9 +25,9 @@ #include <stdio.h> -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLI_timecode.h" /* own include */ diff --git a/source/blender/blenlib/intern/voronoi_2d.c b/source/blender/blenlib/intern/voronoi_2d.c index 6bd9a16cd55..61052aa00f9 100644 --- a/source/blender/blenlib/intern/voronoi_2d.c +++ b/source/blender/blenlib/intern/voronoi_2d.c @@ -28,8 +28,8 @@ #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_voronoi_2d.h" #include "BLI_utildefines.h" +#include "BLI_voronoi_2d.h" #define VORONOI_EPS 1e-2f diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index 724f27f4667..df7e7107d11 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -24,17 +24,17 @@ #ifdef WIN32 -# include <stdlib.h> -# include <stdio.h> # include <conio.h> +# include <stdio.h> +# include <stdlib.h> # include "MEM_guardedalloc.h" # define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY -# include "BLI_winstuff.h" -# include "BLI_utildefines.h" # include "BLI_path_util.h" # include "BLI_string.h" +# include "BLI_utildefines.h" +# include "BLI_winstuff.h" # include "../blenkernel/BKE_global.h" /* G.background, bad level include (no function calls) */ diff --git a/source/blender/blenlib/intern/winstuff_dir.c b/source/blender/blenlib/intern/winstuff_dir.c index 1e5a0db678e..4db385bd8aa 100644 --- a/source/blender/blenlib/intern/winstuff_dir.c +++ b/source/blender/blenlib/intern/winstuff_dir.c @@ -34,8 +34,8 @@ # endif # define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY -# include "BLI_winstuff.h" # include "BLI_utildefines.h" +# include "BLI_winstuff.h" # include "utfconv.h" # define PATH_SUFFIX "\\*" |