diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-29 04:50:52 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-29 04:50:52 +0400 |
commit | 10b4a86dbfd9ce56e53f5369258aebbac2f28be3 (patch) | |
tree | 16da57dac511133c088520a487ebfada6f6e3145 /source/blender/blenlib/intern | |
parent | 63290beee19132f93094b90cfb6dd5d210756451 (diff) |
code cleanup: quiet warnings building with mingw.
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/fileops.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 8b3cfd07ee9..ad6a9ff2ac3 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -45,7 +45,7 @@ #ifdef __MINGW32__ #include <ctype.h> #endif -#include <io.h> +# include <io.h> # include "BLI_winstuff.h" # include "BLI_callbacks.h" # include "utf_winfunc.h" @@ -374,7 +374,7 @@ void BLI_dir_create_recursive(const char *dirname) * blah1/blah2 (without slash) */ BLI_strncpy(tmp, dirname, sizeof(tmp)); - lslash = BLI_last_slash(tmp); + lslash = (char *)BLI_last_slash(tmp); if (lslash && (*(lslash + 1) == '\0')) { *lslash = '\0'; @@ -385,7 +385,7 @@ void BLI_dir_create_recursive(const char *dirname) if (BLI_exists(tmp)) return; - lslash = BLI_last_slash(tmp); + lslash = (char *)BLI_last_slash(tmp); if (lslash) { /* Split about the last slash and recurse */ diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 6b9b371a4f3..1f96c10e712 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -61,7 +61,8 @@ #endif #ifdef WIN32 -#include "utf_winfunc.h" +# include "utf_winfunc.h" +# include "utfconv.h" # include <io.h> # ifdef _WIN32_IE # undef _WIN32_IE |