* [PATCH] Rename __in and __out in headers to avoid collision with Windows APIs
[not found] <20170707002450.00007720@gmail.com>
@ 2017-07-07 8:47 ` David Macek
2017-07-07 14:46 ` Corinna Vinschen
0 siblings, 1 reply; 2+ messages in thread
From: David Macek @ 2017-07-07 8:47 UTC (permalink / raw)
To: cygwin-patches, newlib
* string.h: Local variables in expansion of strdupa and strndupa
* sys/wait.h: Fields in anonymous union in expansion of __wait_status_to_int
---
Reposting to the newlib ML.
There should be no API nor ABI changes, as the changed names are private to the macros.
The new "s" in string.h comes from the __s parameter. The new "s" in wait.h comes from "status". I'm not sure what the naming conventions are, so I'm open to corrections.
newlib/libc/include/string.h | 18 +++++++++---------
winsup/cygwin/include/sys/wait.h | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index 29e0d44766..7833aa1561 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -141,16 +141,16 @@ int _EXFUN(strverscmp,(const char *, const char *));
#if __GNU_VISIBLE && defined(__GNUC__)
#define strdupa(__s) \
- (__extension__ ({const char *__in = (__s); \
- size_t __len = strlen (__in) + 1; \
- char * __out = (char *) __builtin_alloca (__len); \
- (char *) memcpy (__out, __in, __len);}))
+ (__extension__ ({const char *__sin = (__s); \
+ size_t __len = strlen (__sin) + 1; \
+ char * __sout = (char *) __builtin_alloca (__len); \
+ (char *) memcpy (__sout, __sin, __len);}))
#define strndupa(__s, __n) \
- (__extension__ ({const char *__in = (__s); \
- size_t __len = strnlen (__in, (__n)) + 1; \
- char *__out = (char *) __builtin_alloca (__len); \
- __out[__len-1] = '\0'; \
- (char *) memcpy (__out, __in, __len-1);}))
+ (__extension__ ({const char *__sin = (__s); \
+ size_t __len = strnlen (__sin, (__n)) + 1; \
+ char *__sout = (char *) __builtin_alloca (__len); \
+ __sout[__len-1] = '\0'; \
+ (char *) memcpy (__sout, __sin, __len-1);}))
#endif /* __GNU_VISIBLE && __GNUC__ */
/* There are two common basename variants. If you do NOT #include <libgen.h>
diff --git a/winsup/cygwin/include/sys/wait.h b/winsup/cygwin/include/sys/wait.h
index 69e1b9d9bf..dc89458437 100644
--- a/winsup/cygwin/include/sys/wait.h
+++ b/winsup/cygwin/include/sys/wait.h
@@ -88,7 +88,7 @@ inline int __wait_status_to_int (const union wait & __status)
#else /* !__cplusplus */
#define __wait_status_to_int(__status) (__extension__ \
- (((union { __typeof(__status) __in; int __out; }) { .__in = (__status) }).__out))
+ (((union { __typeof(__status) __sin; int __sout; }) { .__sin = (__status) }).__sout))
#endif /* __cplusplus */
--
2.13.2.windows.1
--
David Macek
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Rename __in and __out in headers to avoid collision with Windows APIs
2017-07-07 8:47 ` [PATCH] Rename __in and __out in headers to avoid collision with Windows APIs David Macek
@ 2017-07-07 14:46 ` Corinna Vinschen
0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2017-07-07 14:46 UTC (permalink / raw)
To: newlib, cygwin-patches
[-- Attachment #1: Type: text/plain, Size: 748 bytes --]
On Jul 7 10:47, David Macek wrote:
> * string.h: Local variables in expansion of strdupa and strndupa
> * sys/wait.h: Fields in anonymous union in expansion of __wait_status_to_int
> ---
> Reposting to the newlib ML.
>
> There should be no API nor ABI changes, as the changed names are private to the macros.
>
> The new "s" in string.h comes from the __s parameter. The new "s" in wait.h comes from "status". I'm not sure what the naming conventions are, so I'm open to corrections.
>
> newlib/libc/include/string.h | 18 +++++++++---------
> winsup/cygwin/include/sys/wait.h | 2 +-
> 2 files changed, 10 insertions(+), 10 deletions(-)
Pushed.
Thanks,
Corinna
--
Corinna Vinschen
Cygwin Maintainer
Red Hat
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-07 14:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20170707002450.00007720@gmail.com>
2017-07-07 8:47 ` [PATCH] Rename __in and __out in headers to avoid collision with Windows APIs David Macek
2017-07-07 14:46 ` Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).