[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55249] trunk/blender/source/blender: Fix for build error with previous commit, seems the order of #includes matters here.

[Brecht Van Lommel]

Revision: 55249
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55249
Author:   blendix
Date:     2013-03-13 17:30:31 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Fix for build error with previous commit, seems the order of #includes matters here.

Modified Paths:
--------------
    trunk/blender/source/blender/avi/intern/avi.c
    trunk/blender/source/blender/blenlib/BLI_fileops.h
    trunk/blender/source/blender/render/intern/source/voxeldata.c

Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c	2013-03-13 17:16:49 UTC (rev 55248)
+++ trunk/blender/source/blender/avi/intern/avi.c	2013-03-13 17:30:31 UTC (rev 55249)
@@ -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"

Modified: trunk/blender/source/blender/blenlib/BLI_fileops.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_fileops.h	2013-03-13 17:16:49 UTC (rev 55248)
+++ trunk/blender/source/blender/blenlib/BLI_fileops.h	2013-03-13 17:30:31 UTC (rev 55249)
@@ -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>
 

Modified: trunk/blender/source/blender/render/intern/source/voxeldata.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/voxeldata.c	2013-03-13 17:16:49 UTC (rev 55248)
+++ trunk/blender/source/blender/render/intern/source/voxeldata.c	2013-03-13 17:30:31 UTC (rev 55249)
@@ -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"