Issue #10910: merge from 3.5

diff --cc Include/pyport.h
Simple merge

diff --cc Misc/NEWS
index ea701fd7e2c20a4471c5ba3e8c6962fa202b3ad9,d91678005bc18222b921d8292a5d8fd1ba225766..eabbf8c49db670daae497ecd4b96712a1cbbe2ba
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -121,75 -63,6 +121,79 @@@ Librar
  
  - Issue #27522: Avoid an unintentional reference cycle in email.feedparser.
  
 +- Issue 27512: Fix a segfault when os.fspath() called a an __fspath__() method
 +  that raised an exception. Patch by Xiang Zhang.
 +
 +- Issue 26988: Add AutoEnum.
 +
 +Tests
 +-----
 +
 +- Issue #25805: Skip a test in test_pkgutil as needed that doesn't work when
 +  ``__name__ == __main__``. Patch by SilentGhost.
 +
 +- Issue #27472: Add test.support.unix_shell as the path to the default shell.
 +
 +- Issue #27369: In test_pyexpat, avoid testing an error message detail that
 +  changed in Expat 2.2.0.
 +
 +Windows
 +-------
 +
 +- Issue #27647: Update bundled Tcl/Tk to 8.6.6.
 +
 +- Issue #27610: Adds PEP 514 metadata to Windows installer
 +
 +- Issue #27469: Adds a shell extension to the launcher so that drag and drop
 +  works correctly.
 +
 +- Issue #27309: Enables proper Windows styles in python[w].exe manifest.
 +
 +Build
 +-----
 +
 +- Issue #25825: Correct the references to Modules/python.exp, which is
 +  required on AIX.  The references were accidentally changed in 3.5.0a1.
 +
 +- Issue #27453: CPP invocation in configure must use CPPFLAGS. Patch by
 +  Chi Hsuan Yen.
 +
 +- Issue #27641: The configure script now inserts comments into the makefile
 +  to prevent the pgen and _freeze_importlib executables from being cross-
 +  compiled.
 +
 +- 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.6.0 alpha 3
 +==================================
 +
 +*Release date: 2016-07-11*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #27473: Fixed possible integer overflow in bytes and bytearray
 +  concatenations.  Patch by Xiang Zhang.
 +
 +- Issue #23034: The output of a special Python build with defined COUNT_ALLOCS,
 +  SHOW_ALLOC_COUNT or SHOW_TRACK_COUNT macros is now off by  default.  It can
 +  be re-enabled using the "-X showalloccount" option.  It now outputs to stderr
 +  instead of stdout.
 +
 +- Issue #27443: __length_hint__() of bytearray iterators no longer return a
 +  negative integer for a resized bytearray.
 +
 +- Issue #27007: The fromhex() class methods of bytes and bytearray subclasses
 +  now return an instance of corresponding subclass.
 +
 +Library
 +-------
 +
  - Issue #26844: Fix error message for imp.find_module() to refer to 'path'
    instead of 'name'. Patch by Lev Maximov.