[PATCH] Include wctype.h in wchar.h as an XSI extension

[PATCH] Include wctype.h in wchar.h as an XSI extension

[Yaakov Selkowitz]

However, note that this inclusion is obsolescent in SUSv4 and therefore
may be removed in the next revision.

http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/wchar.h.html

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
 newlib/libc/include/wchar.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index d5fc26f..e5b840d 100644
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -20,6 +20,10 @@
 /* For __STDC_ISO_10646__ */
 #include <sys/features.h>
 
+#if __XSI_VISIBLE /* && __XSI_VISIBLE < 800 */
+#include <wctype.h>
+#endif
+
 #ifndef WEOF
 # define WEOF ((wint_t)-1)
 #endif
-- 
2.8.3

Re: [PATCH] Include wctype.h in wchar.h as an XSI extension

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 924 bytes --]

On Aug 11 16:37, Yaakov Selkowitz wrote:
> However, note that this inclusion is obsolescent in SUSv4 and therefore
> may be removed in the next revision.
> 
> http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/wchar.h.html
> 
> Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
> ---
>  newlib/libc/include/wchar.h | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
> index d5fc26f..e5b840d 100644
> --- a/newlib/libc/include/wchar.h
> +++ b/newlib/libc/include/wchar.h
> @@ -20,6 +20,10 @@
>  /* For __STDC_ISO_10646__ */
>  #include <sys/features.h>
>  
> +#if __XSI_VISIBLE /* && __XSI_VISIBLE < 800 */
> +#include <wctype.h>
> +#endif
> +
>  #ifndef WEOF
>  # define WEOF ((wint_t)-1)
>  #endif
> -- 
> 2.8.3

Looks good, please apply.


Thanks,
Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH] Do not include wctype.h in wchar.h with _GNU_SOURCE

[Yaakov Selkowitz]

_GNU_SOURCE generally enables all features, but in this case the POSIX
requirement to #include <wctype.h> for these is preferred.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
 newlib/libc/include/wchar.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index f4996ec..3a2b89b 100644
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -33,7 +33,7 @@ typedef __gnuc_va_list va_list;
 #endif
 #endif /* __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE */
 
-#if __XSI_VISIBLE /* && __XSI_VISIBLE < 800 */
+#if __XSI_VISIBLE /* && __XSI_VISIBLE < 800 */ && !__GNU_VISIBLE
 #include <wctype.h>
 #endif
 
-- 
2.8.3

Re: [PATCH] Do not include wctype.h in wchar.h with _GNU_SOURCE

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 929 bytes --]

On Aug 12 13:47, Yaakov Selkowitz wrote:
> _GNU_SOURCE generally enables all features, but in this case the POSIX
> requirement to #include <wctype.h> for these is preferred.
> 
> Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
> ---
>  newlib/libc/include/wchar.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
> index f4996ec..3a2b89b 100644
> --- a/newlib/libc/include/wchar.h
> +++ b/newlib/libc/include/wchar.h
> @@ -33,7 +33,7 @@ typedef __gnuc_va_list va_list;
>  #endif
>  #endif /* __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE */
>  
> -#if __XSI_VISIBLE /* && __XSI_VISIBLE < 800 */
> +#if __XSI_VISIBLE /* && __XSI_VISIBLE < 800 */ && !__GNU_VISIBLE
>  #include <wctype.h>
>  #endif
>  
> -- 
> 2.8.3

ACK, as discussed on IRC.


Thanks,
Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]