[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40733] trunk/blender/source/blender/ python/intern/bpy_rna.c: fix for msvc, I thought this was only needed for mingw.
Campbell Barton
ideasman42 at gmail.com
Sat Oct 1 17:54:36 CEST 2011
Revision: 40733
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40733
Author: campbellbarton
Date: 2011-10-01 15:54:36 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
fix for msvc, I thought this was only needed for mingw.
Modified Paths:
--------------
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2011-10-01 15:40:32 UTC (rev 40732)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2011-10-01 15:54:36 UTC (rev 40733)
@@ -4706,7 +4706,7 @@
NULL, /* struct PyMethodDef *tp_methods; */
NULL, /* struct PyMemberDef *tp_members; */
NULL, /* struct PyGetSetDef *tp_getset; */
-#ifdef FREE_WINDOWS
+#if defined(_MSC_VER) || defined(FREE_WINDOWS)
NULL, /* defer assignment */
#else
&PyType_Type, /* struct _typeobject *tp_base; */
@@ -5281,7 +5281,7 @@
NULL, /* reprfunc tp_str; */
/* will only use these if this is a subtype of a py class */
-#ifdef FREE_WINDOWS
+#if defined(_MSC_VER) || defined(FREE_WINDOWS)
NULL, /* defer assignment */
#else
PyObject_GenericGetAttr, /* getattrofunc tp_getattro; */
@@ -5314,7 +5314,7 @@
#endif
/*** Added in release 2.2 ***/
/* Iterators */
-#ifdef FREE_WINDOWS
+#if defined(_MSC_VER) || defined(FREE_WINDOWS)
NULL, /* defer assignment */
#else
PyObject_SelfIter, /* getiterfunc tp_iter; */
@@ -5705,7 +5705,7 @@
#endif
/* for some reason MSVC complains of these */
-#ifdef FREE_WINDOWS
+#if defined(_MSC_VER) || defined(FREE_WINDOWS)
pyrna_struct_meta_idprop_Type.tp_base= &PyType_Type;
pyrna_prop_collection_iter_Type.tp_iter= PyObject_SelfIter;
More information about the Bf-blender-cvs
mailing list