[Python-checkins] cpython (3.5): Issue #10910: Update FreedBSD version checks for the ctype UTF-8 workaround.

ned.deily python-checkins at python.org
Mon Aug 15 03:24:29 EDT 2016


https://hg.python.org/cpython/rev/27a99a722828
changeset:   102663:27a99a722828
branch:      3.5
user:        Ned Deily <nad at python.org>
date:        Mon Aug 15 03:08:18 2016 -0400
summary:
  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.

files:
  Include/pyport.h |  4 +++-
  Misc/NEWS        |  4 ++++
  2 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -677,7 +677,9 @@
 
 #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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -175,6 +175,10 @@
 - 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?
 ===========================
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list