From b97001ef46e599642affde61e31abace71486703 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 15 Aug 2016 03:04:36 -0400 Subject: [PATCH] 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. --- Include/pyport.h | 4 +++- Misc/NEWS | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Include/pyport.h b/Include/pyport.h index 736b984e056..0c78a1e5b66 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -702,7 +702,9 @@ extern int fdatasync(int); #ifdef __FreeBSD__ #include -#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 4a232707d27..b9d473499d3 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? ============================