Merge legacy updates into 5.0-active branch.

diff --cc mingwrt/ChangeLog
index a98e578,e2677bd..471a017
--- 1/mingwrt/ChangeLog
--- 2/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@@ -1,24 -1,25 +1,44 @@@
+ 2016-05-19  Keith Marshall  <keithmarshall@users.sourceforge.net>
+ 
+       Occlude unsupported _S_IFBLK feature; resolve issue [#1146].
+ 
+       * include/sys/stat.h (_MINGW_S_IFBLK_KLUDGE): New feature test macro;
+       do not define it, and strongly recommend that it remains undefined.
+       [!_MINGW_S_IFBLK_KLUDGE] (_S_IFBLK, S_IFBLK): Do not define them.
+       [!_MINGW_S_IFBLK_KLUDGE] (_S_ISBLK, S_ISBLK): Poison them.
+       [_MINGW_S_IFBLK_KLUDGE] (_S_IFBLK, S_IFBLK): Adjust definitions; use a
+       modified value, which is guaranteed to be impossible to match in...
+       [_S_ISBLK, S_ISBLK]: ...these, thus enforcing false test results.
+ 
+ 2016-05-18  Keith Marshall  <keithmarshall@users.sourceforge.net>
+ 
+       Fix a typo in a <sys/stat.h> inline function definition.
+ 
+       * include/sys/stat.h [__MSVCRT_VERSION__ >= __MSVCR80_DLL]
+       (stat): First argument declared as 'int'; should be 'const char *';
+       correct it.
+ 
  2016-05-12  Keith Marshall  <keithmarshall@users.sourceforge.net>
  
 +      Synchronize package version management with Win32-API.
 +
 +      * VERSION.m4: New file; link it to keep in sync with identically named
 +      file in top level composite package source directory; it defines...
 +      (__VERSION__): ...this new composite package version macro.
 +
 +      * aclocal.m4: Link it, to keep in sync with identically named files in
 +      top level composite source and sibling w32api sub-package directories.
 +      (__VERSION__): New macro; include VERSION.m4 to define it.
 +      (__BUG_REPORT_URL__): New macro; define it.
 +
 +      * configure.ac (AC_INIT): Assign package version and bug report URL...
 +      (__VERSION__, __BUG_REPORT_URL__): ...from these, as defined through
 +      automatic inclusion of aclocal.m4
 +
 +      * Makefile.in (configure): Add dependency on VERSION.m4
 +
 +2016-05-12  Keith Marshall  <keithmarshall@users.sourceforge.net>
 +
        Resolve some strnlen() implementation issues.
  
        * mingwex/strnlen.s (__mingw_strnlen) [!NUL]: Correct termination