[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33025] trunk/blender/source/blender/ windowmanager/intern/wm_operators.c: Revert r33023

Joshua Leung aligorith at gmail.com
Thu Nov 11 23:05:18 CET 2010


Revision: 33025
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33025
Author:   aligorith
Date:     2010-11-11 23:05:17 +0100 (Thu, 11 Nov 2010)

Log Message:
-----------
Revert r33023

Was causing compile troubles with MSVC:
wm_operators.c
C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE\io.h(322) : error C3163: '_write': attribute
s inconsistent with previous declaration
        C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE\io.h(224) : see declaration of '_wri
te'
scons: *** [C:\blenderdev\b250\buildvc\source\blender\windowmanager\intern\wm_operators.obj] Error 2

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-11-11 21:49:40 UTC (rev 33024)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-11-11 22:05:17 UTC (rev 33025)
@@ -34,7 +34,10 @@
 #include <assert.h>
 
 #ifdef WIN32
-#include "BLI_winstuff.h"
+// XXX: winstuff commented out, as was getting  "io.h(322) : error C3163: '_write': attribute..." from MSVC - Aligorith 2010Nov12
+//#include "BLI_winstuff.h"
+#include <windows.h>  
+
 #include <io.h>
 #endif
 





More information about the Bf-blender-cvs mailing list