changeset:   102666:12a70477db03
branch:      2.7
user:        Ned Deily <nad@python.org>
date:        Mon Aug 15 03:04:36 2016 -0400
files:       Include/pyport.h Misc/NEWS
description:
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 -r e0ec3471cb09 -r 12a70477db03 Include/pyport.h
--- a/Include/pyport.h	Mon Aug 15 02:59:31 2016 -0400
+++ b/Include/pyport.h	Mon Aug 15 03:04:36 2016 -0400
@@ -702,7 +702,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 -r e0ec3471cb09 -r 12a70477db03 Misc/NEWS
--- a/Misc/NEWS	Mon Aug 15 02:59:31 2016 -0400
+++ b/Misc/NEWS	Mon Aug 15 03:04:36 2016 -0400
@@ -97,6 +97,13 @@
 - 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?
 ============================