* Sync up to trunk head (r60691).

svn path=/branches/ntvdm/; revision=60692
This commit is contained in:
Amine Khaldi 2013-10-17 11:19:05 +00:00
commit 25445ea35f
5851 changed files with 218087 additions and 724119 deletions

View file

@ -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;