[libcxx] Add underscores to win32 locale headers.

[halyavin]

Summary

Avoid possible collisions with macros.

[jroelofs]

src/support/win32/locale_win32.cpp

90–91

__ap

100–101

__ap

101

s.result.__res.

[jroelofs]

looks fine to me, but this is the sort of thing that @EricWF usually wants the final say on.

[halyavin]

@EricWF , could you please look at this change? It doesn't have any functional changes.

[halyavin]

update to new revision

[halyavin]

ping.

[mclow.lists]

We don't usually do this in source files, because they don't get included in people's builds - just the library build.

if you look in src/mutex.cpp, you'll see stuff like:
void __call_once(volatile unsigned long& flag, void* arg, void(*func)(void*))

On the other hand, if you are seeing a conflict, then we can apply this.

src/support/win32/locale_win32.cpp

 #include <memory>
 #include <type_traits>
 
 int __libcpp_vasprintf(char **sptr, const char *__restrict fmt, va_list ap);
 
 using std::__libcpp_locale_guard;
 
 // FIXME: base currently unused. Needs manual work to construct the new locale
-locale_t newlocale( int mask, const char * locale, locale_t /*base*/ )
+locale_t newlocale( int __mask, const char * __locale, locale_t /*__base*/ )
 {
-    return {_create_locale( LC_ALL, locale ), locale};
+    return {_create_locale( LC_ALL, __locale ), __locale};
 }
 
 decltype(MB_CUR_MAX) MB_CUR_MAX_L( locale_t __l )
 {
 #if defined(_LIBCPP_MSVCRT)
   return ___mb_cur_max_l_func(__l);
 #else
   __libcpp_locale_guard __current(__l);
   return MB_CUR_MAX;
 #endif
 }
 
 
-lconv *localeconv_l( locale_t loc )
+lconv *localeconv_l( locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
+    __libcpp_locale_guard __current(__loc);
     return localeconv();
 }
-size_t mbrlen_l( const char *__restrict s, size_t n,
-                 mbstate_t *__restrict ps, locale_t loc )
+size_t mbrlen_l( const char *__restrict __s, size_t __n,
+                 mbstate_t *__restrict __ps, locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
-    return mbrlen( s, n, ps );
+    __libcpp_locale_guard __current(__loc);
+    return mbrlen( __s, __n, __ps );
 }
-size_t mbsrtowcs_l( wchar_t *__restrict dst, const char **__restrict src,
-                    size_t len, mbstate_t *__restrict ps, locale_t loc )
+size_t mbsrtowcs_l( wchar_t *__restrict __dst, const char **__restrict __src,
+                    size_t __len, mbstate_t *__restrict __ps, locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
-    return mbsrtowcs( dst, src, len, ps );
+    __libcpp_locale_guard __current(__loc);
+    return mbsrtowcs( __dst, __src, __len, __ps );
 }
-size_t wcrtomb_l( char *__restrict s, wchar_t wc, mbstate_t *__restrict ps,
-                  locale_t loc )
+size_t wcrtomb_l( char *__restrict __s, wchar_t __wc, mbstate_t *__restrict __ps,
+                  locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
-    return wcrtomb( s, wc, ps );
+    __libcpp_locale_guard __current(__loc);
+    return wcrtomb( __s, __wc, __ps );
 }
-size_t mbrtowc_l( wchar_t *__restrict pwc, const char *__restrict s,
-                  size_t n, mbstate_t *__restrict ps, locale_t loc )
+size_t mbrtowc_l( wchar_t *__restrict __pwc, const char *__restrict __s,
+                  size_t __n, mbstate_t *__restrict __ps, locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
-    return mbrtowc( pwc, s, n, ps );
+    __libcpp_locale_guard __current(__loc);
+    return mbrtowc( __pwc, __s, __n, __ps );
 }
-size_t mbsnrtowcs_l( wchar_t *__restrict dst, const char **__restrict src,
-                     size_t nms, size_t len, mbstate_t *__restrict ps, locale_t loc )
+size_t mbsnrtowcs_l( wchar_t *__restrict __dst, const char **__restrict __src,
+                     size_t __nms, size_t __len, mbstate_t *__restrict __ps, locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
-    return mbsnrtowcs( dst, src, nms, len, ps );
+    __libcpp_locale_guard __current(__loc);
+    return mbsnrtowcs( __dst, __src, __nms, __len, __ps );
 }
-size_t wcsnrtombs_l( char *__restrict dst, const wchar_t **__restrict src,
-                     size_t nwc, size_t len, mbstate_t *__restrict ps, locale_t loc )
+size_t wcsnrtombs_l( char *__restrict __dst, const wchar_t **__restrict __src,
+                     size_t __nwc, size_t __len, mbstate_t *__restrict __ps, locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
-    return wcsnrtombs( dst, src, nwc, len, ps );
+    __libcpp_locale_guard __current(__loc);
+    return wcsnrtombs( __dst, __src, __nwc, __len, __ps );
 }
-wint_t btowc_l( int c, locale_t loc )
+wint_t btowc_l( int __c, locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
-    return btowc( c );
+    __libcpp_locale_guard __current(__loc);
+    return btowc( __c );
 }
-int wctob_l( wint_t c, locale_t loc )
+int wctob_l( wint_t __c, locale_t __loc )
 {
-    __libcpp_locale_guard __current(loc);
-    return wctob( c );
+    __libcpp_locale_guard __current(__loc);
+    return wctob( __c );
 }
 
-int snprintf_l(char *ret, size_t n, locale_t loc, const char *format, ...)
+int snprintf_l(char *__ret, size_t __n, locale_t __loc, const char *__format, ...)
 {
-    __libcpp_locale_guard __current(loc);
-    va_list ap;
-    va_start( ap, format );
-    int result = vsnprintf( ret, n, format, ap );
-    va_end(ap);
-    return result;
+    __libcpp_locale_guard __current(__loc);
+    va_list __ap;
+    va_start(__ap, __format );
+    int __result = vsnprintf( __ret, __n, __format, __ap );
+    va_end(__ap);
+    return __result;
 }
 
-int asprintf_l( char **ret, locale_t loc, const char *format, ... )
+int asprintf_l( char **__ret, locale_t __loc, const char *__format, ... )
 {
-    va_list ap;
-    va_start( ap, format );
-    int result = vasprintf_l( ret, loc, format, ap );
-    va_end(ap);
-    return result;
+    va_list __ap;
+    va_start( __ap, __format );
+    int __result = vasprintf_l( __ret, __loc, __format, __ap );
+    va_end(__ap);
+    return __result;
 }
-int vasprintf_l( char **ret, locale_t loc, const char *format, va_list ap )
+int vasprintf_l( char **__ret, locale_t __loc, const char *__format, va_list __ap )
 {
-    __libcpp_locale_guard __current(loc);
-    return __libcpp_vasprintf( ret, format, ap );
+    __libcpp_locale_guard __current(__loc);
+    return __libcpp_vasprintf( __ret, __format, __ap );
 }
 
 #if !defined(_LIBCPP_MSVCRT)
-float strtof_l(const char* nptr, char** endptr, locale_t loc) {
-  __libcpp_locale_guard __current(loc);
-  return strtof(nptr, endptr);
+float strtof_l(const char* __nptr, char** __endptr, locale_t __loc) {
+  __libcpp_locale_guard __current(__loc);
+  return strtof(__nptr, __endptr);
 }
 
-long double strtold_l(const char* nptr, char** endptr, locale_t loc) {
-  __libcpp_locale_guard __current(loc);
-  return strtold(nptr, endptr);
+long double strtold_l(const char* __nptr, char** __endptr, locale_t __loc) {
+  __libcpp_locale_guard __current(__loc);
+  return strtold(__nptr, __endptr);
 }
 #endif