diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-03 08:39:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-03 08:39:12 +0400 |
| commit | 2dc988df8c053517d74f9280435e0a55a449a4c6 (patch) | |
| tree | 40d9a6cbd033c4764063500c813dbe14c2cc133a /intern/guardedalloc | |
| parent | 8f1e51a7d96a469718e5281aac66ac086da474a1 (diff) | |
reorder BLI_strict_flags.h include so its not conflicting with stdio.h on apple.
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 8fa9cb90c8e..e8102d98345 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -37,9 +37,6 @@ #include <stdarg.h> #include <sys/types.h> -/* to ensure strict conversions */ -#include "../../source/blender/blenlib/BLI_strict_flags.h" - /* mmap exception */ #if defined(WIN32) # include "mmap_win.h" @@ -59,6 +56,10 @@ #include "MEM_guardedalloc.h" +/* to ensure strict conversions */ +#include "../../source/blender/blenlib/BLI_strict_flags.h" + + /* should always be defined except for experimental cases */ #ifdef WITH_GUARDEDALLOC |