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.

diff --git a/Include/pyport.h b/Include/pyport.h
index 3bab84d690a5bfb211a591c6113ecee2eac2970c..ba49221b8e295e387d640783eb72e2af99196c8d 100644 (file)
--- 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 4c6ca30d26004093caed622907317f70273261f7..d91678005bc18222b921d8292a5d8fd1ba225766 100644 (file)
--- 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?
 ===========================