* Sync up to trunk head (r60691).

svn path=/branches/ntvdm/; revision=60692

lib/sdk/crt/mbstring/_setmbcp.c

@@ -206,7 +206,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo)
   }
 
   mbcinfo->mbcodepage = newcp;
-  if(MSVCRT_locale && mbcinfo == MSVCRT_locale->mbcinfo)
+  if(global_locale && mbcinfo == MSVCRT_locale->mbcinfo)
     memcpy(_mbctype, MSVCRT_locale->mbcinfo->mbctype, sizeof(_mbctype));
 
   return 0;

lib/sdk/crt/printf/_cwprintf.c

@@ -10,7 +10,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 _cwprintf(const wchar_t* format, ...)
 {
   int retval;

lib/sdk/crt/printf/_sxprintf.c

@@ -22,13 +22,13 @@
 
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 
-int _cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr);
+int __cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr);
 
 int
 #if defined(USER32_WSPRINTF) && defined(_M_IX86)
-_stdcall
+__stdcall
 #else
-_cdecl
+__cdecl
 #endif
 _sxprintf(
     TCHAR *buffer,

lib/sdk/crt/printf/_vscprintf.c

@@ -8,12 +8,12 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-int _cdecl streamout(FILE *stream, const char *format, va_list argptr);
+int __cdecl streamout(FILE *stream, const char *format, va_list argptr);
 
-int _vscprintf(
+int
+_vscprintf(
    const char *format,
-   va_list argptr
-)
+   va_list argptr)
 {
     int ret;
     FILE* nulfile = fopen("nul", "w");

lib/sdk/crt/printf/_vscwprintf.c

@@ -12,12 +12,12 @@
 #include <ntddk.h>
 #endif
 
-int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr);
+int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr);
 
-int _vscwprintf(
+int
+_vscwprintf(
    const wchar_t *format,
-   va_list argptr
-)
+   va_list argptr)
 {
     int ret;
 #ifndef _LIBCNT_

lib/sdk/crt/printf/fprintf.c

@@ -10,7 +10,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 fprintf(FILE *file, const char *format, ...)
 {
     va_list argptr;

lib/sdk/crt/printf/fprintf_s.c

@@ -12,7 +12,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 fprintf_s(FILE* file, const char *format, ...)
 {
     va_list argptr;

lib/sdk/crt/printf/fwprintf.c

@@ -10,7 +10,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 fwprintf(FILE* file, const wchar_t *format, ...)
 {
     va_list argptr;

lib/sdk/crt/printf/fwprintf_s.c

@@ -12,7 +12,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 fwprintf_s(FILE* file, const wchar_t *format, ...)
 {
     va_list valist;

lib/sdk/crt/printf/printf.c

@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 printf(const char *format, ...)
 {
     va_list argptr;

lib/sdk/crt/printf/printf_s.c

@@ -12,7 +12,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 printf_s(const char *format, ...)
 {
     va_list argptr;

lib/sdk/crt/printf/streamout.c

@@ -307,7 +307,7 @@ streamout_wstring(FILE *stream, const wchar_t *string, size_t count)
 #endif
 
 int
-_cdecl
+__cdecl
 streamout(FILE *stream, const TCHAR *format, va_list argptr)
 {
     static const TCHAR digits_l[] = _T("0123456789abcdef0x");

lib/sdk/crt/printf/vfprintf.c

@@ -9,10 +9,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-int _cdecl streamout(FILE *stream, const char *format, va_list argptr);
+int __cdecl streamout(FILE *stream, const char *format, va_list argptr);
 
 int
-_cdecl
+__cdecl
 vfprintf(FILE *file, const char *format, va_list argptr)
 {
     int result;

lib/sdk/crt/printf/vfprintf_s.c

@@ -12,10 +12,10 @@
 #include <stdarg.h>
 #include <internal/safecrt.h>
 
-int _cdecl streamout(FILE *stream, const char *format, va_list argptr);
+int __cdecl streamout(FILE *stream, const char *format, va_list argptr);
 
 int
-_cdecl
+__cdecl
 vfprintf_s(FILE* file, const char *format, va_list argptr)
 {
     int result;

lib/sdk/crt/printf/vfwprintf.c

@@ -9,10 +9,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr);
+int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr);
 
 int
-_cdecl
+__cdecl
 vfwprintf(FILE* file, const wchar_t *format, va_list argptr)
 {
      int ret;

lib/sdk/crt/printf/vfwprintf_s.c

@@ -13,10 +13,10 @@
 #include <stdarg.h>
 #include <internal/safecrt.h>
 
-int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr);
+int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr);
 
 int
-_cdecl
+__cdecl
 vfwprintf_s(FILE* file, const wchar_t *format, va_list argptr)
 {
     int ret;

lib/sdk/crt/printf/vprintf.c

@@ -10,7 +10,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 vprintf(const char *format, va_list argptr)
 {
     return vfprintf(stdout, format, argptr);

lib/sdk/crt/printf/vprintf_s.c

@@ -12,7 +12,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 vprintf_s(const char *format, va_list valist)
 {
     return vfprintf_s(stdout,format,valist);

lib/sdk/crt/printf/vwprintf.c

@@ -10,8 +10,8 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 vwprintf(const wchar_t *format, va_list valist)
 {
-    return vfwprintf(stdout,format,valist);
+    return vfwprintf(stdout, format, valist);
 }

lib/sdk/crt/printf/vwprintf_s.c

@@ -12,8 +12,8 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 vwprintf_s(const wchar_t *format, va_list valist)
 {
-    return vfwprintf_s(stdout,format,valist);
+    return vfwprintf_s(stdout, format, valist);
 }

lib/sdk/crt/printf/wprintf.c

@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 wprintf(const wchar_t *format, ...)
 {
     va_list argptr;

lib/sdk/crt/printf/wprintf_s.c

@@ -12,7 +12,7 @@
 #include <stdarg.h>
 
 int
-_cdecl
+__cdecl
 wprintf_s(const wchar_t *format, ...)
 {
     va_list argptr;