[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51913] trunk/blender/source/blender/ python/intern: hopefully fixes building on msvc, also some minor header edits

[Campbell Barton]

Revision: 51913
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51913
Author:   campbellbarton
Date:     2012-11-05 14:58:12 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
hopefully fixes building on msvc, also some minor header edits

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy.c
    trunk/blender/source/blender/python/intern/bpy_util.h

Modified: trunk/blender/source/blender/python/intern/bpy.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy.c	2012-11-05 14:50:18 UTC (rev 51912)
+++ trunk/blender/source/blender/python/intern/bpy.c	2012-11-05 14:58:12 UTC (rev 51913)
@@ -32,6 +32,9 @@
 
 #include <Python.h>
 
+#include "RNA_types.h"
+#include "RNA_access.h"
+
 #include "bpy.h" 
 #include "bpy_util.h" 
 #include "bpy_rna.h"
@@ -49,8 +52,6 @@
 #include "BKE_global.h" /* XXX, G.main only */
 #include "BKE_blender.h"
 
-#include "RNA_access.h"
-
 #include "MEM_guardedalloc.h"
 
 /* external util modules */

Modified: trunk/blender/source/blender/python/intern/bpy_util.h
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_util.h	2012-11-05 14:50:18 UTC (rev 51912)
+++ trunk/blender/source/blender/python/intern/bpy_util.h	2012-11-05 14:58:12 UTC (rev 51913)
@@ -24,7 +24,6 @@
  *  \ingroup pythonintern
  */
 
-
 #ifndef __BPY_UTIL_H__
 #define __BPY_UTIL_H__
 
@@ -33,12 +32,13 @@
 #endif
 
 #if PY_VERSION_HEX <  0x03030000
-#  warning "Python 3.2 will be deprecated soon, upgrade to Python 3.3."
+#  ifdef _MSC_VER
+#    pragma message("Python 3.2 will be deprecated soon, upgrade to Python 3.3.")
+#  else
+#    warning "Python 3.2 will be deprecated soon, upgrade to Python 3.3."
+#  endif
 #endif
 
-
-#include "RNA_types.h" /* for EnumPropertyItem only */
-
 struct EnumPropertyItem;
 struct ReportList;
 
@@ -56,4 +56,5 @@
 
 extern void bpy_context_set(struct bContext *C, PyGILState_STATE *gilstate);
 extern void bpy_context_clear(struct bContext *C, PyGILState_STATE *gilstate);
-#endif
+
+#endif  /* __BPY_UTIL_H__ */