From bf61b38d984539d63dce809923e4edb7865bf721 Mon Sep 17 00:00:00 2001 From: David Macek Date: Fri, 7 Jul 2017 10:47:02 +0200 Subject: Rename __in and __out in headers to avoid collision with Windows APIs * string.h: Local variables in expansion of strdupa and strndupa * sys/wait.h: Fields in anonymous union in expansion of __wait_status_to_int --- newlib/libc/include/string.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'newlib/libc') diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 29e0d4476..7833aa156 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 -- cgit v1.2.3