Commit: 7602ad983922b3d73049121fd49b113a635ee3ee - mingw-org-wsl (git)

The MinGW.org Windows System Libraries

Commit MetaInfo

• Revisão: 7602ad983922b3d73049121fd49b113a635ee3ee (tree)
• Hora: 2016-10-18 20:02:44
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Mensagem de Log

Merge mingwrt-3.22.4 updates into 5.0-active branch.

Mudança Sumário

• modified: .hgtags
• modified: mingwrt/ChangeLog
• modified: mingwrt/include/wchar.h

Diff

--- a/.hgtags
+++ b/.hgtags
@@ -7,3 +7,4 @@ c42986e81e9ce0a5fcf8f09012f9d0f038032bac mingwrt-3.22.1-release
 96dcdb8540b8cdebba812d8125ed29761ec9aa39 mingwrt-3.22.2-release
 cd725d6ae238714355b000ae9d7c6f3ace34317d w32api-3.18.2-release
 9db085b7464425de03f96232b5e6f48d119d8713 mingwrt-3.22.3-release
+e92b7e85ef0890284b99d2c8243519f77457e2be mingwrt-3.22.4-release

--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,26 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Merge mingwrt-3.22.4 updates into 5.0-active branch.
+
+	* configure.ac: Preserve original 5.0-active state.
+	* include/wchar.h: Update per 2016-10-17 commits.
+
[phone]  Keith Marshall  <[e-mail]>
+
+	Prepare and tag mingwrt-3.22.4 patch release.
+
+	* configure.ac (AC_INIT): Increment patch level.
+
[phone]  Keith Marshall  <[e-mail]>
+
+	Resolve an ANSI mode <string.h> vs. <wchar.h> conflict.
+
+	* include/wchar.h [!(_WCHAR_H && _STRING_H)]: Change condition...
+	[!(_WCHAR_H && (_STRING_H && !__STRICT_ANSI__))]: ...to this; the
+	guarded declarations are not exposed by including <string.h> when...
+	[__STRICT_ANSI__]: ...this is defined; hence, we must declare them
+	when including <wchar.h>, even after including <string.h>
+
 2016-10-14  Keith Marshall  <[e-mail]>
 
 	Add dependency tracking for tests/Makefile.

--- a/mingwrt/include/wchar.h
+++ b/mingwrt/include/wchar.h
@@ -378,10 +378,13 @@ _BEGIN_C_DECLS
  */
 #endif	/* ! RC_INVOKED */
 #endif	/* !__STRING_H_SOURCED__ */
-#if ! (defined RC_INVOKED || (defined _WCHAR_H && defined _STRING_H))
-/* ...such that these declarations are exposed when either _WCHAR_H, or
- * _STRING_H is defined, (but not both, since that would indicate that
- * these declarations have already been processed).
+#if ! defined RC_INVOKED
+#if !(defined _WCHAR_H && (defined _STRING_H && ! defined __STRICT_ANSI__))
+/* ...such that these declarations are exposed when either _WCHAR_H is defined,
+ * or when _STRING_H is defined and __STRICT_ANSI__ is not, but NOT when BOTH of
+ * these apply, since that indicates that this group of declarations has already
+ * been processed, during partial inclusion of <wchar.h> by <string.h>, whereas
+ * we are now including <wchar.h> in its own right.
  *
  *
  * Wide character versions of the ISO-C standard string functions.
@@ -468,9 +471,10 @@ _CRTIMP __cdecl __MINGW_NOTHROW  wchar_t *wcsupr (wchar_t *);
  * inclusion of <string.h>; revert the declarative condition, to make it
  * specific to <wchar.h> alone.
  */
-#endif	/* !(RC_INVOKED || (_WCHAR_H && _STRING_H)) */
-#if defined _WCHAR_H && ! defined RC_INVOKED
+#endif	/* !(_WCHAR_H && (_STRING_H && !__STRICT_ANSI__)) */
+#endif	/* ! RC_INVOKED */
 
+#if defined _WCHAR_H && ! defined RC_INVOKED
 #ifndef __STRICT_ANSI__
 typedef wchar_t  _Wint_t;
 #endif