summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-07-25 19:47:29 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-07-25 19:47:29 (GMT)
commit54701f303fdde38c53811776ba2d16fabf219dcc (patch)
tree94ff5a9ec6ad68cf51a268b4b6c81a8672733666
parent0db50cf7eb83ef07cb1b010d5e9dba2aa1e48e34 (diff)
parent64ba60aa57fd65d3107787cde6bb2f988e7e1c53 (diff)
downloadcpython-54701f303fdde38c53811776ba2d16fabf219dcc.zip
cpython-54701f303fdde38c53811776ba2d16fabf219dcc.tar.gz
cpython-54701f303fdde38c53811776ba2d16fabf219dcc.tar.bz2
Issue #21958: Merge with 3.4
-rw-r--r--Misc/NEWS3
-rw-r--r--PC/pyconfig.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 3f49d9c..f1db374 100644
--- 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
index e82e6e9..49c2599 100644
--- 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