fix for building with mingw in since recent changes.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 5 Mar 2013 07:02:59 +0000 (07:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 5 Mar 2013 07:02:59 +0000 (07:02 +0000)
source/blender/blenlib/intern/storage.c
source/blender/blenlib/intern/winstuff.c

index cee9288..12d9d4a 100644 (file)
@@ -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 @@ static void bli_builddir(const char *dirname, const char *relname,
 #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);
                                        }
index 65fb490..767c616 100644 (file)
@@ -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"