diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-03-13 21:30:31 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-03-13 21:30:31 +0400 |
| commit | 385650974a3f38cfcebdcbfb71bac24b021e850d (patch) | |
| tree | c5ebd2c4427fc62f2104481a19704812597164c6 /source/blender | |
| parent | 5162a155afe279519ad353312307ab5496c16603 (diff) | |
Fix for build error with previous commit, seems the order of #includes matters here.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/avi/intern/avi.c | 5 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_fileops.h | 8 | ||||
| -rw-r--r-- | source/blender/render/intern/source/voxeldata.c | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 6a5e8a61bd8..1b1ec1c08af 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -38,9 +38,14 @@ #include <stdio.h> #include <ctype.h> +#ifdef WIN32 +#include "BLI_winstuff.h" +#endif + #include "MEM_guardedalloc.h" #include "MEM_sys_types.h" +#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "AVI_avi.h" diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h index 820f32f7158..217afb1ca21 100644 --- a/source/blender/blenlib/BLI_fileops.h +++ b/source/blender/blenlib/BLI_fileops.h @@ -33,14 +33,6 @@ #ifndef __BLI_FILEOPS_H__ #define __BLI_FILEOPS_H__ -/* for 64 bit fseek, ftell, .. */ -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - -/* for bool */ -#include "BLI_utildefines.h" - #include <stdio.h> #include <sys/stat.h> diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 993752617d3..9990ad7e900 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -34,6 +34,10 @@ #include <stdlib.h> #include <stdio.h> +#ifdef WIN32 +#include "BLI_winstuff.h" +#endif + #include "MEM_guardedalloc.h" #include "BLI_math.h" |