diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-09-15 20:13:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-15 20:13:32 +0400 |
commit | 9b518710c678a48c829be6d2432eba427f733bdf (patch) | |
tree | 0850efebe963bb55cbc129268a2961d8a054664a /source/blender/editors/space_file/fsmenu.c | |
parent | 95a3f4109682c12145de4523157e2a968b83719d (diff) |
update for MingW/CMake
- ignore MSVC warnings when FREE_WINDOWS is defined to quiet warnings.
- the CMake flags were not being set correctly making blender have weirdo colors (no -funsigned-char).
Diffstat (limited to 'source/blender/editors/space_file/fsmenu.c')
-rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 8211257da02..a043fc8cfd1 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -280,13 +280,10 @@ void fsmenu_read_bookmarks(struct FSMenu* fsmenu, const char *filename) void fsmenu_read_system(struct FSMenu* fsmenu) { char line[256]; - FILE *fp; - #ifdef WIN32 /* Add the drive names to the listing */ { __int64 tmp; - char folder[256]; char tmps[4]; int i; @@ -304,10 +301,10 @@ void fsmenu_read_system(struct FSMenu* fsmenu) } /* Adding Desktop and My Documents */ - SHGetSpecialFolderPath(0, folder, CSIDL_PERSONAL, 0); - fsmenu_insert_entry(fsmenu,FS_CATEGORY_BOOKMARKS, folder, 1, 0); - SHGetSpecialFolderPath(0, folder, CSIDL_DESKTOPDIRECTORY, 0); - fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, folder, 1, 0); + SHGetSpecialFolderPath(0, line, CSIDL_PERSONAL, 0); + fsmenu_insert_entry(fsmenu,FS_CATEGORY_BOOKMARKS, line, 1, 0); + SHGetSpecialFolderPath(0, line, CSIDL_DESKTOPDIRECTORY, 0); + fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, line, 1, 0); } #else #ifdef __APPLE__ @@ -474,6 +471,7 @@ void fsmenu_read_system(struct FSMenu* fsmenu) /* loop over mount points */ struct mntent *mnt; int len; + FILE *fp; fp = setmntent (MOUNTED, "r"); if (fp == NULL) { |