diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2012-09-17 12:36:47 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2012-09-17 12:36:47 +0400 |
commit | 0020fff74927cb86b8e69cedfe5c7e08c7d48052 (patch) | |
tree | 35055d01c629baccf663fcd46a6a5fa954e3d1ba /source/blender | |
parent | dd62f5b7b8ff93d883d6c74007e844fd4440d27d (diff) |
Fix compilation issue, also get rid of annoying "_MSC_VER not defined"
preprocessor ambiguity for MinGW
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/BLI_fileops_types.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_fileops_types.h b/source/blender/blenlib/BLI_fileops_types.h index a19909a8f26..1c6463eb6ea 100644 --- a/source/blender/blenlib/BLI_fileops_types.h +++ b/source/blender/blenlib/BLI_fileops_types.h @@ -46,7 +46,7 @@ struct direntry { mode_t type; char *relname; char *path; -#if (defined(WIN32) || defined(WIN64)) && (_MSC_VER >= 1500) +#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__) && (_MSC_VER >= 1500) struct _stat64 s; #elif defined(__MINGW32__) struct _stati64 s; diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 809b1a8fc0a..27bf69b8699 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -328,16 +328,16 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks) tmps[2] = '\\'; tmps[3] = 0; - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, tmps, 1, 0); + fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, tmps, FS_INSERT_SORTED); } } /* Adding Desktop and My Documents */ if (read_bookmarks) { SHGetSpecialFolderPath(0, line, CSIDL_PERSONAL, 0); - fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, line, 1, 0); + fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, line, FS_INSERT_SORTED); SHGetSpecialFolderPath(0, line, CSIDL_DESKTOPDIRECTORY, 0); - fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, line, 1, 0); + fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, line, FS_INSERT_SORTED); } } #else |