changeset:   91869:1f5e8380f791
parent:      91866:413017768dde
parent:      91868:1c35cefd25b7
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Fri Jul 25 14:47:29 2014 -0500
files:       Misc/NEWS PC/pyconfig.h
description:
Issue #21958: Merge with 3.4


diff -r 413017768dde -r 1f5e8380f791 Misc/NEWS
--- a/Misc/NEWS	Fri Jul 25 12:41:31 2014 -0700
+++ b/Misc/NEWS	Fri Jul 25 14:47:29 2014 -0500
@@ -664,6 +664,9 @@
 Build
 -----
 
+- Issue #21958: Define HAVE_ROUND when building with Visual Studio 2013 and
+  above.  Patch by Zachary Turner.
+
 - Issue #18093: the programs that embed the CPython runtime are now in a
   separate "Programs" directory, rather than being kept in the Modules
   directory.
diff -r 413017768dde -r 1f5e8380f791 PC/pyconfig.h
--- a/PC/pyconfig.h	Fri Jul 25 12:41:31 2014 -0700
+++ b/PC/pyconfig.h	Fri Jul 25 14:47:29 2014 -0500
@@ -436,6 +436,11 @@
 /* Define to 1 if you have the `copysign' function. */
 #define HAVE_COPYSIGN 1
 
+/* Define to 1 if you have the `round' function. */
+#if _MSC_VER >= 1800
+#define HAVE_ROUND 1
+#endif
+
 /* Define to 1 if you have the `isinf' macro. */
 #define HAVE_DECL_ISINF 1