summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-08-15 07:08:18 (GMT)
committerNed Deily <nad@python.org>2016-08-15 07:08:18 (GMT)
commit3d4559936a0e628c1c910c48b26907f2b2f2c9cb (patch)
tree331a4e0c3aace0597f53736a9512de62bbb15d35
parent7659aab5e990dd33fab47bd29c445ed7202e0cac (diff)
downloadcpython-3d4559936a0e628c1c910c48b26907f2b2f2c9cb.zip
cpython-3d4559936a0e628c1c910c48b26907f2b2f2c9cb.tar.gz
cpython-3d4559936a0e628c1c910c48b26907f2b2f2c9cb.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/NEWS4
2 files changed, 7 insertions, 1 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index 3bab84d..ba49221 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -677,7 +677,9 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
#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 4c6ca30..d916780 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -175,6 +175,10 @@ Build
- Issue #26662: Set PYTHON_FOR_GEN in configure as the Python program to be
used for file generation during the 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 3.5.2?
===========================