Compile failure on MSVC10

[Taro MURAOKA]

I have found and fixed compile failures of 7.3.1237 on MSVC10.
It seems failures of macro expansion, but I don't know the reason.
Please check attached patch.


Best.

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.



# HG changeset patch
# Parent 713c2e7480dab00d0bea78798e92147622a516ad
diff -r 713c2e7480da -r 420704bc4191 src/if_py_both.h
--- a/src/if_py_both.h	Mon Jun 24 08:02:00 2013 +0900
+++ b/src/if_py_both.h	Mon Jun 24 08:28:47 2013 +0900
@@ -139,13 +139,15 @@
     }
     else
     {
+#if PY_MAJOR_VERSION < 3
 	PyErr_FORMAT(PyExc_TypeError,
-#if PY_MAJOR_VERSION < 3
 		N_("expected str() or unicode() instance, but got %s")
+		, Py_TYPE_NAME(obj));
 #else
+	PyErr_FORMAT(PyExc_TypeError,
 		N_("expected bytes() or str() instance, but got %s")
+		, Py_TYPE_NAME(obj));
 #endif
-		, Py_TYPE_NAME(obj));
 	return NULL;
     }
 
@@ -191,15 +193,17 @@
     }
     else
     {
+#if PY_MAJOR_VERSION < 3
 	PyErr_FORMAT(PyExc_TypeError,
-#if PY_MAJOR_VERSION < 3
 		N_("expected int(), long() or something supporting "
 		   "coercing to long(), but got %s")
+		, Py_TYPE_NAME(obj));
 #else
+	PyErr_FORMAT(PyExc_TypeError,
 		N_("expected int() or something supporting coercing to int(), "
 		   "but got %s")
+		, Py_TYPE_NAME(obj));
 #endif
-		, Py_TYPE_NAME(obj));
 	return -1;
     }