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

msvcrt: Use _configthreadlocale arguments definition from public header. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-12-04 15:50:25 +01:00 committed by Alexandre Julliard
parent 79e950bb79
commit a7b9948f39
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msvcrt/locale.c
View File

@ -2052,12 +2052,12 @@ int CDECL _configthreadlocale(int type)
thread_data_t *data = msvcrt_get_thread_data(); thread_data_t *data = msvcrt_get_thread_data();
int ret; int ret;
ret = (data->locale_flags & LOCALE_THREAD ? MSVCRT__ENABLE_PER_THREAD_LOCALE : ret = (data->locale_flags & LOCALE_THREAD ? _ENABLE_PER_THREAD_LOCALE :
MSVCRT__DISABLE_PER_THREAD_LOCALE); _DISABLE_PER_THREAD_LOCALE);
if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) if(type == _ENABLE_PER_THREAD_LOCALE)
data->locale_flags |= LOCALE_THREAD; data->locale_flags |= LOCALE_THREAD;
else if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) else if(type == _DISABLE_PER_THREAD_LOCALE)
data->locale_flags &= ~LOCALE_THREAD; data->locale_flags &= ~LOCALE_THREAD;
else if(type) else if(type)
ret = -1; ret = -1;

3
dlls/msvcrt/msvcrt.h
View File

@ -296,9 +296,6 @@ extern FILE MSVCRT__iob[];
#define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF)
#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1
#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2
_locale_t CDECL get_current_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; _locale_t CDECL get_current_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN;
void CDECL free_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; void CDECL free_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN;
pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN;

12
include/msvcrt/locale.h
View File

@ -68,6 +68,18 @@ struct lconv
struct tm; struct tm;
#ifndef _CONFIG_LOCALE_SWT
#define _CONFIG_LOCALE_SWT
#define _ENABLE_PER_THREAD_LOCALE 0x1
#define _DISABLE_PER_THREAD_LOCALE 0x2
#define _ENABLE_PER_THREAD_LOCALE_GLOBAL 0x10
#define _DISABLE_PER_THREAD_LOCALE_GLOBAL 0x20
#define _ENABLE_PER_THREAD_LOCALE_NEW 0x100
#define _DISABLE_PER_THREAD_LOCALE_NEW 0x200
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif