headers: crt: merge wchar_s.h into wchar.h Signed-off-by: Zhongteng Gui <dragon-archer@outlook.com> Signed-off-by: LIU Hao <lh_mouse@126.com>
diff --git a/mingw-w64-crt/secapi/_vcwprintf_s.c b/mingw-w64-crt/secapi/_vcwprintf_s.c index 0cddc52..3bc2778 100644 --- a/mingw-w64-crt/secapi/_vcwprintf_s.c +++ b/mingw-w64-crt/secapi/_vcwprintf_s.c
@@ -2,7 +2,7 @@ #include <malloc.h> #include <errno.h> #include <msvcrt.h> -#include <sec_api/wchar_s.h> +#include <wchar.h> static int __cdecl _int_vcwprintf_s (const wchar_t *, va_list); static int __cdecl _stub (const wchar_t *, va_list);
diff --git a/mingw-w64-crt/secapi/_vcwprintf_s_l.c b/mingw-w64-crt/secapi/_vcwprintf_s_l.c index 978e546..f1158e9 100644 --- a/mingw-w64-crt/secapi/_vcwprintf_s_l.c +++ b/mingw-w64-crt/secapi/_vcwprintf_s_l.c
@@ -2,7 +2,7 @@ #include <malloc.h> #include <errno.h> #include <msvcrt.h> -#include <sec_api/wchar_s.h> +#include <wchar.h> static int __cdecl _int_vcwprintf_s_l (const wchar_t *, _locale_t, va_list); static int __cdecl _stub (const wchar_t *, _locale_t, va_list);
diff --git a/mingw-w64-crt/secapi/_waccess_s.c b/mingw-w64-crt/secapi/_waccess_s.c index 7957312..1a850c9 100644 --- a/mingw-w64-crt/secapi/_waccess_s.c +++ b/mingw-w64-crt/secapi/_waccess_s.c
@@ -2,7 +2,7 @@ #include <malloc.h> #include <errno.h> #include <msvcrt.h> -#include <sec_api/wchar_s.h> +#include <wchar.h> static errno_t __cdecl _int_waccess_s (const wchar_t *, int); static errno_t __cdecl _stub (const wchar_t *, int);
diff --git a/mingw-w64-crt/secapi/_wmktemp_s.c b/mingw-w64-crt/secapi/_wmktemp_s.c index fc887f3..a220709 100644 --- a/mingw-w64-crt/secapi/_wmktemp_s.c +++ b/mingw-w64-crt/secapi/_wmktemp_s.c
@@ -2,7 +2,7 @@ #include <malloc.h> #include <errno.h> #include <msvcrt.h> -#include <sec_api/wchar_s.h> +#include <wchar.h> static errno_t __cdecl _int_wmktemp_s (wchar_t *, size_t); static errno_t __cdecl _stub (wchar_t *, size_t);
diff --git a/mingw-w64-crt/secapi/wmemcpy_s.c b/mingw-w64-crt/secapi/wmemcpy_s.c index 8276f28..d83b4ab 100644 --- a/mingw-w64-crt/secapi/wmemcpy_s.c +++ b/mingw-w64-crt/secapi/wmemcpy_s.c
@@ -2,7 +2,7 @@ #include <malloc.h> #include <errno.h> #include <msvcrt.h> -#include <sec_api/wchar_s.h> +#include <wchar.h> static errno_t __cdecl _int_wmemcpy_s (wchar_t *, size_t, const wchar_t *, size_t); static errno_t __cdecl _stub (wchar_t *, size_t, const wchar_t *, size_t);
diff --git a/mingw-w64-crt/secapi/wmemmove_s.c b/mingw-w64-crt/secapi/wmemmove_s.c index d9f09eb..0aaeead 100644 --- a/mingw-w64-crt/secapi/wmemmove_s.c +++ b/mingw-w64-crt/secapi/wmemmove_s.c
@@ -2,7 +2,7 @@ #include <malloc.h> #include <errno.h> #include <msvcrt.h> -#include <sec_api/wchar_s.h> +#include <wchar.h> static errno_t __cdecl _int_wmemmove_s (wchar_t *, size_t, const wchar_t*, size_t); static errno_t __cdecl _stub (wchar_t *, size_t, const wchar_t *, size_t);
diff --git a/mingw-w64-headers/crt/sec_api/wchar_s.h b/mingw-w64-headers/crt/sec_api/wchar_s.h deleted file mode 100644 index e4222f3..0000000 --- a/mingw-w64-headers/crt/sec_api/wchar_s.h +++ /dev/null
@@ -1,28 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -#ifndef _INC_WCHAR_S -#define _INC_WCHAR_S - -#include <wchar.h> - -_CRT_BEGIN_C_HEADER - - _CRTIMP errno_t __cdecl mbsrtowcs_s(size_t *_Retval,wchar_t *_Dst,size_t _SizeInWords,const char **_PSrc,size_t _N,mbstate_t *_State); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(errno_t,mbsrtowcs_s,size_t*,_Retval,wchar_t,_Dst,const char**,_PSrc,size_t,_N,mbstate_t,_State) - - _CRTIMP errno_t __cdecl wcrtomb_s(size_t *_Retval,char *_Dst,size_t _SizeInBytes,wchar_t _Ch,mbstate_t *_State); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(errno_t,wcrtomb_s,size_t*,_Retval,char,_Dst,wchar_t,_Ch,mbstate_t,_State) - - _CRTIMP errno_t __cdecl wcsrtombs_s(size_t *_Retval,char *_Dst,size_t _SizeInBytes,const wchar_t **_Src,size_t _Size,mbstate_t *_State); - __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(errno_t,wcsrtombs_s,size_t,_Retval,char,_Dst,const wchar_t**,_Src,size_t,_Size,mbstate_t,_State) - - _SECIMP errno_t __cdecl wmemcpy_s (wchar_t *_dest,size_t _numberOfElements,const wchar_t *_src,size_t _count); - _SECIMP errno_t __cdecl wmemmove_s(wchar_t *_dest,size_t _numberOfElements,const wchar_t *_src,size_t _count); - - -_CRT_END_C_HEADER - -#endif
diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h index a747e9c..d524118 100644 --- a/mingw-w64-headers/crt/wchar.h +++ b/mingw-w64-headers/crt/wchar.h
@@ -37,6 +37,18 @@ _CRTIMP size_t __cdecl wcsrtombs(char * __restrict__ _Dest,const wchar_t ** __restrict__ _PSource,size_t _Count,mbstate_t * __restrict__ _State) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; _CRTIMP int __cdecl wctob(wint_t _WCh); + _CRTIMP errno_t __cdecl mbsrtowcs_s(size_t *_Retval,wchar_t *_Dst,size_t _SizeInWords,const char **_PSrc,size_t _N,mbstate_t *_State); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(errno_t,mbsrtowcs_s,size_t*,_Retval,wchar_t,_Dst,const char**,_PSrc,size_t,_N,mbstate_t,_State) + + _CRTIMP errno_t __cdecl wcrtomb_s(size_t *_Retval,char *_Dst,size_t _SizeInBytes,wchar_t _Ch,mbstate_t *_State); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_2(errno_t,wcrtomb_s,size_t*,_Retval,char,_Dst,wchar_t,_Ch,mbstate_t,_State) + + _CRTIMP errno_t __cdecl wcsrtombs_s(size_t *_Retval,char *_Dst,size_t _SizeInBytes,const wchar_t **_Src,size_t _Size,mbstate_t *_State); + __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_3(errno_t,wcsrtombs_s,size_t,_Retval,char,_Dst,const wchar_t**,_Src,size_t,_Size,mbstate_t,_State) + + _SECIMP errno_t __cdecl wmemcpy_s (wchar_t *_dest,size_t _numberOfElements,const wchar_t *_src,size_t _count); + _SECIMP errno_t __cdecl wmemmove_s(wchar_t *_dest,size_t _numberOfElements,const wchar_t *_src,size_t _count); + #ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */ wchar_t *__cdecl wmemset(wchar_t *s, wchar_t c, size_t n); int __cdecl wmemcmp(const wchar_t *s1, const wchar_t *s2,size_t n); @@ -100,6 +112,4 @@ _CRT_END_C_HEADER -#include <sec_api/wchar_s.h> - #endif /* _INC_WCHAR */