[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38250] branches/soc-2011-onion/source/ blender: quiet warning from Microsoft Visual C++ that occurs when version letter is empty

[Jason Wilkins]

Revision: 38250
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38250
Author:   jwilkins
Date:     2011-07-09 08:58:33 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
quiet warning from Microsoft Visual C++ that occurs when version letter is empty

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/python/intern/bpy_app.c
    branches/soc-2011-onion/source/blender/windowmanager/WM_api.h

Modified: branches/soc-2011-onion/source/blender/python/intern/bpy_app.c
===================================================================
--- branches/soc-2011-onion/source/blender/python/intern/bpy_app.c	2011-07-09 08:16:05 UTC (rev 38249)
+++ branches/soc-2011-onion/source/blender/python/intern/bpy_app.c	2011-07-09 08:58:33 UTC (rev 38250)
@@ -112,11 +112,18 @@
 
 	SetObjItem(Py_BuildValue("(iii)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION));
 	SetObjItem(PyUnicode_FromFormat("%d.%02d (sub %d)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION));
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4003) // not enough actual parameters for macro DO_EXPAND when BLENDER_VERSION_CHAR is empty
+#endif
 #if defined(BLENDER_VERSION_CHAR) && EXPAND(BLENDER_VERSION_CHAR) != 1
 	SetStrItem(STRINGIFY(BLENDER_VERSION_CHAR));
 #else
 	SetStrItem("");
 #endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 	SetStrItem(STRINGIFY(BLENDER_VERSION_CYCLE));
 	SetStrItem(bprogname);
 	SetObjItem(PyBool_FromLong(G.background));

Modified: branches/soc-2011-onion/source/blender/windowmanager/WM_api.h
===================================================================
--- branches/soc-2011-onion/source/blender/windowmanager/WM_api.h	2011-07-09 08:16:05 UTC (rev 38249)
+++ branches/soc-2011-onion/source/blender/windowmanager/WM_api.h	2011-07-09 08:58:33 UTC (rev 38250)
@@ -176,7 +176,7 @@
 			void (*remove)(struct bContext *C, void *userdata), void *userdata, int postpone);
 void		WM_event_remove_area_handler(struct ListBase *handlers, void *area);
 
-struct wmEventHandler *WM_event_add_modal_handler(struct bContext *C, struct wmOperator *op);
+struct wmEventHandler *WM_event_add_modal_handler(const struct bContext *C, struct wmOperator *op);
 void		WM_event_remove_handlers(struct bContext *C, ListBase *handlers);
 
 struct wmEventHandler *WM_event_add_dropbox_handler(ListBase *handlers, ListBase *dropboxes);