headers: crt: merge wconio_s.h into corecrt_wconio.h

Signed-off-by: Zhongteng Gui <dragon-archer@outlook.com>
Signed-off-by: LIU Hao <lh_mouse@126.com>

mingw-w64-headers/crt/corecrt_wconio.h

diff --git a/mingw-w64-headers/crt/corecrt_wconio.h b/mingw-w64-headers/crt/corecrt_wconio.h
index 12bd7ef..b50710d 100644
--- a/mingw-w64-headers/crt/corecrt_wconio.h
+++ b/mingw-w64-headers/crt/corecrt_wconio.h
@@ -23,6 +23,8 @@
 
 _CRTIMP wchar_t *__cdecl _cgetws(wchar_t *_Buffer) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
 _CRTIMP int __cdecl _cputws(const wchar_t *_String);
+_SECIMP errno_t __cdecl _cgetws_s (wchar_t *_Buffer,size_t _SizeInWords,size_t *_SizeRead);
+__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _cgetws_s, wchar_t, _Buffer, size_t*, _SizeRead)
 
 /**
  * Functions to read/write single characters from/to console.
@@ -44,6 +46,13 @@
  * Formatted console I/O functions.
  */
 
+_SECIMP int __cdecl _cwprintf_s (const wchar_t *_Format,...);
+_SECIMP int __cdecl _cwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,...);
+_SECIMP int __cdecl _vcwprintf_s (const wchar_t *_Format,va_list _ArgList);
+_SECIMP int __cdecl _vcwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,va_list _ArgList);
+_CRTIMP int __cdecl _cwscanf_s(const wchar_t *_Format,...);
+_CRTIMP int __cdecl _cwscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...);
+
 #ifdef _UCRT
 int __cdecl __conio_common_vcwprintf(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList);
 int __cdecl __conio_common_vcwprintf_p(unsigned __int64 _Options, const wchar_t *_Format, _locale_t _Locale, va_list _ArgList);
@@ -137,6 +146,4 @@
 
 _CRT_END_C_HEADER
 
-#include <sec_api/wconio_s.h>
-
 #endif /* _INC_CORECRT_WCONIO */

mingw-w64-headers/crt/sec_api/wconio_s.h

diff --git a/mingw-w64-headers/crt/sec_api/wconio_s.h b/mingw-w64-headers/crt/sec_api/wconio_s.h
deleted file mode 100644
index 998ca35..0000000
--- a/mingw-w64-headers/crt/sec_api/wconio_s.h
+++ /dev/null
@@ -1,34 +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_WCONIO_S
-#define _INC_WCONIO_S
-
-#include <corecrt_wconio.h>
-
-_CRT_BEGIN_C_HEADER
-
-/**
- * Functions to read/write strings from/to console.
- */
-
-_SECIMP errno_t __cdecl _cgetws_s (wchar_t *_Buffer,size_t _SizeInWords,size_t *_SizeRead);
-__DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _cgetws_s, wchar_t, _Buffer, size_t*, _SizeRead)
-
-/**
- * Formatted console I/O functions.
- */
-
-_SECIMP int __cdecl _cwprintf_s (const wchar_t *_Format,...);
-_SECIMP int __cdecl _cwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,...);
-_SECIMP int __cdecl _vcwprintf_s (const wchar_t *_Format,va_list _ArgList);
-_SECIMP int __cdecl _vcwprintf_s_l (const wchar_t *_Format,_locale_t _Locale,va_list _ArgList);
-_CRTIMP int __cdecl _cwscanf_s(const wchar_t *_Format,...);
-_CRTIMP int __cdecl _cwscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...);
-
-_CRT_END_C_HEADER
-
-#endif /* _INC_WCONIO_S */