[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55044] trunk/blender/source/blender/ blenlib/intern: fix for building with mingw in since recent changes.

[Campbell Barton]

Revision: 55044
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55044
Author:   campbellbarton
Date:     2013-03-05 07:02:59 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
fix for building with mingw in since recent changes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/storage.c
    trunk/blender/source/blender/blenlib/intern/winstuff.c

Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c	2013-03-05 06:38:43 UTC (rev 55043)
+++ trunk/blender/source/blender/blenlib/intern/storage.c	2013-03-05 07:02:59 UTC (rev 55044)
@@ -71,6 +71,7 @@
 #ifdef WIN32
 #  include <io.h>
 #  include <direct.h>
+#  include <limits.h>  /* PATH_MAX */
 #  include "BLI_winstuff.h"
 #  include "utfconv.h"
 #else
@@ -278,10 +279,10 @@
 #ifdef WIN32
 					{
 						wchar_t *name_16 = alloc_utf16_from_8(fullname, 0);
-#if (defined(WIN32) || defined(WIN64)) && (_MSC_VER >= 1500)
-						_wstat64(name_16, &entry->s);
+#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+						_wstat64(name_16, &filec->s);
 #elif defined(__MINGW32__)
-						_stati64(fullname, &entry->s);
+						_stati64(fullname, &file->s);
 #endif
 						free(name_16);
 					}

Modified: trunk/blender/source/blender/blenlib/intern/winstuff.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/winstuff.c	2013-03-05 06:38:43 UTC (rev 55043)
+++ trunk/blender/source/blender/blenlib/intern/winstuff.c	2013-03-05 07:02:59 UTC (rev 55044)
@@ -38,8 +38,6 @@
 #include <conio.h>
 
 #include "MEM_guardedalloc.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
 
 #include "../blenkernel/BKE_global.h"  /* G.background, bad level include (no function calls) */
 
@@ -47,6 +45,7 @@
 #include "BLI_winstuff.h"
 #include "BLI_utildefines.h"
 #include "BLI_path_util.h"
+#include "BLI_string.h"
 
 #include "utf_winfunc.h"
 #include "utfconv.h"