summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-08-15 07:04:36 (GMT)
committerNed Deily <nad@python.org>2016-08-15 07:04:36 (GMT)
commitb97001ef46e599642affde61e31abace71486703 (patch)
treec272c034ae2871dd44242514010aa44c3262c90e
parent98ba455b9afe3fa78751ecae2e9d29f1ba82e7f7 (diff)
downloadcpython-b97001ef46e599642affde61e31abace71486703.zip
cpython-b97001ef46e599642affde61e31abace71486703.tar.gz
cpython-b97001ef46e599642affde61e31abace71486703.tar.bz2
Issue #10910: Update FreedBSD version checks for the ctype UTF-8 workaround.
The original problem has been fixed in newer versions of FreeBSD. Patch by Dimitry Andric of the FreeBSD project.
-rw-r--r--Include/pyport.h4
-rw-r--r--Misc/NEWS7
2 files changed, 10 insertions, 1 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index 736b984..0c78a1e 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -702,7 +702,9 @@ extern int fdatasync(int);
#ifdef __FreeBSD__
#include <osreldate.h>
-#if __FreeBSD_version > 500039
+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
+ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
+ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
# define _PY_PORT_CTYPE_UTF8_ISSUE
#endif
#endif
diff --git a/Misc/NEWS b/Misc/NEWS
index 4a23270..b9d4734 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -97,6 +97,13 @@ Tests
- Issue #27369: In test_pyexpat, avoid testing an error message detail that
changed in Expat 2.2.0.
+Build
+-----
+
+- Issue #10910: Avoid C++ compilation errors on FreeBSD and OS X.
+ Also update FreedBSD version checks for the original ctype UTF-8 workaround.
+
+
What's New in Python 2.7.12?
============================