[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50688] trunk/blender/source/blender: Fix compilation issue, also get rid of annoying "_MSC_VER not defined"

[Antony Riakiotakis]

Revision: 50688
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50688
Author:   psy-fi
Date:     2012-09-17 08:36:47 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Fix compilation issue, also get rid of annoying "_MSC_VER not defined"
preprocessor ambiguity for MinGW

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_fileops_types.h
    trunk/blender/source/blender/editors/space_file/fsmenu.c

Modified: trunk/blender/source/blender/blenlib/BLI_fileops_types.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_fileops_types.h	2012-09-17 07:12:02 UTC (rev 50687)
+++ trunk/blender/source/blender/blenlib/BLI_fileops_types.h	2012-09-17 08:36:47 UTC (rev 50688)
@@ -46,7 +46,7 @@
 	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;

Modified: trunk/blender/source/blender/editors/space_file/fsmenu.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/fsmenu.c	2012-09-17 07:12:02 UTC (rev 50687)
+++ trunk/blender/source/blender/editors/space_file/fsmenu.c	2012-09-17 08:36:47 UTC (rev 50688)
@@ -328,16 +328,16 @@
 				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