diff options
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 2 | ||||
| -rw-r--r-- | intern/guardedalloc/cpp/mallocn.cpp | 2 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_guarded_impl.c | 4 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_lockfree_impl.c | 2 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mmap_win.c | 4 | ||||
| -rw-r--r-- | intern/guardedalloc/test/simpletest/memtest.c | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 2a4ae5355a0..d5b109ee59f 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -52,8 +52,8 @@ #include <stdio.h> /* needed for FILE* */ /* needed for uintptr_t and attributes, exception, dont use BLI anywhere else in MEM_* */ -#include "../../source/blender/blenlib/BLI_sys_types.h" #include "../../source/blender/blenlib/BLI_compiler_attrs.h" +#include "../../source/blender/blenlib/BLI_sys_types.h" #ifdef __cplusplus extern "C" { diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp index 0804e096dc6..94d614b942f 100644 --- a/intern/guardedalloc/cpp/mallocn.cpp +++ b/intern/guardedalloc/cpp/mallocn.cpp @@ -18,8 +18,8 @@ * \ingroup MEM */ -#include <new> #include "../MEM_guardedalloc.h" +#include <new> void *operator new(size_t size, const char *str) throw(std::bad_alloc); void *operator new[](size_t size, const char *str) throw(std::bad_alloc); diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c index de2b2eee93a..f601609c6e0 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.c +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c @@ -23,9 +23,9 @@ * Guarded memory allocation, and boundary-write detection. */ +#include <stdarg.h> #include <stdlib.h> #include <string.h> /* memcpy */ -#include <stdarg.h> #include <sys/types.h> #include "MEM_guardedalloc.h" @@ -33,8 +33,8 @@ /* to ensure strict conversions */ #include "../../source/blender/blenlib/BLI_strict_flags.h" -#include "mallocn_intern.h" #include "atomic_ops.h" +#include "mallocn_intern.h" /* Only for debugging: * store original buffer's name when doing MEM_dupallocN diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c index 87091bb9862..ab7d9097669 100644 --- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c +++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c @@ -20,9 +20,9 @@ * Memory allocation which keeps track on allocated memory counters */ +#include <stdarg.h> #include <stdlib.h> #include <string.h> /* memcpy */ -#include <stdarg.h> #include <sys/types.h> #include "MEM_guardedalloc.h" diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c index 3508ae4e1aa..245fe05b6af 100644 --- a/intern/guardedalloc/intern/mmap_win.c +++ b/intern/guardedalloc/intern/mmap_win.c @@ -23,11 +23,11 @@ #ifdef WIN32 -# include <windows.h> # include <errno.h> # include <io.h> -# include <sys/types.h> # include <stdio.h> +# include <sys/types.h> +# include <windows.h> # include "mmap_win.h" diff --git a/intern/guardedalloc/test/simpletest/memtest.c b/intern/guardedalloc/test/simpletest/memtest.c index 8acced088f6..5c37ceb5b24 100644 --- a/intern/guardedalloc/test/simpletest/memtest.c +++ b/intern/guardedalloc/test/simpletest/memtest.c @@ -29,10 +29,10 @@ /* Number of chunks to test with */ #define NUM_BLOCKS 10 +#include "MEM_guardedalloc.h" #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include "MEM_guardedalloc.h" +#include <string.h> static void mem_error_cb(const char *errorStr) { |