ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Don't include MSVC 8.0+ locale functions in SOs for older DLLs. 

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2018-01-03 21:33:01 -07:00 committed by Alexandre Julliard
parent b489c6e9b1
commit 512c945e9a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msvcrt/locale.c
View File

@ -449,8 +449,9 @@ char* CDECL _Getdays(void)
return out; return out;
} }
#if _MSVCR_VER >= 110
/********************************************************************* /*********************************************************************
* _W_Getdays (MSVCRT.@) * _W_Getdays (MSVCR100.@)
*/ */
MSVCRT_wchar_t* CDECL _W_Getdays(void) MSVCRT_wchar_t* CDECL _W_Getdays(void)
{ {
@ -481,6 +482,7 @@ MSVCRT_wchar_t* CDECL _W_Getdays(void)
return out; return out;
} }
#endif
/********************************************************************* /*********************************************************************
* _Getmonths (MSVCRT.@) * _Getmonths (MSVCRT.@)
@ -515,8 +517,9 @@ char* CDECL _Getmonths(void)
return out; return out;
} }
#if _MSVCR_VER >= 110
/********************************************************************* /*********************************************************************
* _W_Getmonths (MSVCRT.@) * _W_Getmonths (MSVCR100.@)
*/ */
MSVCRT_wchar_t* CDECL _W_Getmonths(void) MSVCRT_wchar_t* CDECL _W_Getmonths(void)
{ {
@ -547,6 +550,7 @@ MSVCRT_wchar_t* CDECL _W_Getmonths(void)
return out; return out;
} }
#endif
/********************************************************************* /*********************************************************************
* _Gettnames (MSVCRT.@) * _Gettnames (MSVCRT.@)
@ -575,6 +579,7 @@ void* CDECL _Gettnames(void)
return ret; return ret;
} }
#if _MSVCR_VER >= 110
/********************************************************************* /*********************************************************************
* _W_Gettnames (MSVCR110.@) * _W_Gettnames (MSVCR110.@)
*/ */
@ -582,6 +587,7 @@ void* CDECL _W_Gettnames(void)
{ {
return _Gettnames(); return _Gettnames();
} }
#endif
/********************************************************************* /*********************************************************************
* __crtLCMapStringA (MSVCRT.@) * __crtLCMapStringA (MSVCRT.@)
@ -644,6 +650,7 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i
return GetLocaleInfoW( lcid, type, buffer, len ); return GetLocaleInfoW( lcid, type, buffer, len );
} }
#if _MSVCR_VER >= 110
/********************************************************************* /*********************************************************************
* __crtGetLocaleInfoEx (MSVC110.@) * __crtGetLocaleInfoEx (MSVC110.@)
*/ */
@ -652,6 +659,7 @@ int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, MSVCRT_wchar_t
TRACE("(%s, %x, %p, %d)\n", debugstr_w(locale), type, buffer, len); TRACE("(%s, %x, %p, %d)\n", debugstr_w(locale), type, buffer, len);
return GetLocaleInfoEx(locale, type, buffer, len); return GetLocaleInfoEx(locale, type, buffer, len);
} }
#endif
/********************************************************************* /*********************************************************************
* btowc(MSVCRT.@) * btowc(MSVCRT.@)
@ -709,10 +717,10 @@ LCID* CDECL ___lc_handle_func(void)
return get_locinfo()->lc_handle; return get_locinfo()->lc_handle;
} }
#if _MSVCR_VER >= 110
/********************************************************************* /*********************************************************************
* ___lc_locale_name_func (MSVCR110.@) * ___lc_locale_name_func (MSVCR110.@)
*/ */
#if _MSVCR_VER >= 110
MSVCRT_wchar_t** CDECL ___lc_locale_name_func(void) MSVCRT_wchar_t** CDECL ___lc_locale_name_func(void)
{ {
return get_locinfo()->lc_name; return get_locinfo()->lc_name;
@ -1890,6 +1898,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlo
return ret ? current_lc_all : NULL; return ret ? current_lc_all : NULL;
} }
#if _MSVCR_VER >= 80
/********************************************************************* /*********************************************************************
* _configthreadlocale (MSVCR80.@) * _configthreadlocale (MSVCR80.@)
*/ */
@ -1937,6 +1946,7 @@ int CDECL _configthreadlocale(int type)
return -1; return -1;
} }
#endif
BOOL msvcrt_init_locale(void) BOOL msvcrt_init_locale(void)
{ {