diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-05 11:02:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-05 11:02:59 +0400 |
| commit | 47c47ef7a2791840b4c6f8c3b7c76092009923ef (patch) | |
| tree | 8ff2b00de3c5a07beb35db43e8f254776469671d /source/blender/blenlib | |
| parent | fcc807f2948b6a88af573f63b9bb5aaeb14f8ca2 (diff) | |
fix for building with mingw in since recent changes.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/storage.c | 7 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index cee92888cce..12d9d4a174f 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -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); } diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index 65fb490b218..767c616e3f2 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -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" |