Issue #21958: Merge with 3.4

zware · zware · commit 54701f303fdd · 2014-07-25T14:47:29.000-05:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -664,6 +664,9 @@ IDLE
 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 --git a/PC/pyconfig.h b/PC/pyconfig.h
@@ -436,6 +436,11 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* 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
 
