headers: crt: merge conio_s.h into conio.h

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

mingw-w64-crt/secapi/_cgets_s.c

diff --git a/mingw-w64-crt/secapi/_cgets_s.c b/mingw-w64-crt/secapi/_cgets_s.c
index 6b6917b..5ecfb37 100644
--- a/mingw-w64-crt/secapi/_cgets_s.c
+++ b/mingw-w64-crt/secapi/_cgets_s.c
@@ -2,7 +2,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <msvcrt.h>
-#include <sec_api/conio_s.h>
+#include <conio.h>
 
 static errno_t __cdecl _int_cgets_s (char *, size_t, size_t *);
 static errno_t __cdecl _stub (char *, size_t, size_t *);

mingw-w64-crt/secapi/_cgetws_s.c

diff --git a/mingw-w64-crt/secapi/_cgetws_s.c b/mingw-w64-crt/secapi/_cgetws_s.c
index 42f308d..5225e57 100644
--- a/mingw-w64-crt/secapi/_cgetws_s.c
+++ b/mingw-w64-crt/secapi/_cgetws_s.c
@@ -2,7 +2,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <msvcrt.h>
-#include <sec_api/conio_s.h>
+#include <conio.h>
 
 static errno_t __cdecl _int_cgetws_s (wchar_t *, size_t, size_t *);
 static errno_t __cdecl _stub (wchar_t *, size_t, size_t *);

mingw-w64-crt/secapi/_cprintf_s.c

diff --git a/mingw-w64-crt/secapi/_cprintf_s.c b/mingw-w64-crt/secapi/_cprintf_s.c
index eef77df..6e9aef3 100644
--- a/mingw-w64-crt/secapi/_cprintf_s.c
+++ b/mingw-w64-crt/secapi/_cprintf_s.c
@@ -2,7 +2,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <msvcrt.h>
-#include <sec_api/conio_s.h>
+#include <conio.h>
 
 int __cdecl (*__MINGW_IMP_SYMBOL(_cprintf_s))(const char *,...) = 
  _cprintf_s;

mingw-w64-crt/secapi/_cprintf_s_l.c

diff --git a/mingw-w64-crt/secapi/_cprintf_s_l.c b/mingw-w64-crt/secapi/_cprintf_s_l.c
index cce1d51..4bf540c 100644
--- a/mingw-w64-crt/secapi/_cprintf_s_l.c
+++ b/mingw-w64-crt/secapi/_cprintf_s_l.c
@@ -2,7 +2,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <msvcrt.h>
-#include <sec_api/conio_s.h>
+#include <conio.h>
 
 int __cdecl (*__MINGW_IMP_SYMBOL(_cprintf_s_l))(const char *, _locale_t, ...) = 
  _cprintf_s_l;

mingw-w64-crt/secapi/_cwprintf_s.c

diff --git a/mingw-w64-crt/secapi/_cwprintf_s.c b/mingw-w64-crt/secapi/_cwprintf_s.c
index 013ccc4..8ce3198 100644
--- a/mingw-w64-crt/secapi/_cwprintf_s.c
+++ b/mingw-w64-crt/secapi/_cwprintf_s.c
@@ -2,7 +2,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <msvcrt.h>
-#include <sec_api/conio_s.h>
+#include <conio.h>
 
 int __cdecl (*__MINGW_IMP_SYMBOL(_cwprintf_s))(const wchar_t *,...) = 
  _cwprintf_s;

mingw-w64-crt/secapi/_cwprintf_s_l.c

diff --git a/mingw-w64-crt/secapi/_cwprintf_s_l.c b/mingw-w64-crt/secapi/_cwprintf_s_l.c
index 50c9c4b..026d98e 100644
--- a/mingw-w64-crt/secapi/_cwprintf_s_l.c
+++ b/mingw-w64-crt/secapi/_cwprintf_s_l.c
@@ -2,7 +2,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <msvcrt.h>
-#include <sec_api/conio_s.h>
+#include <conio.h>
 
 int __cdecl (*__MINGW_IMP_SYMBOL(_cwprintf_s_l))(const wchar_t *, _locale_t, ...) = 
  _cwprintf_s_l;

mingw-w64-crt/secapi/_vcprintf_s.c

diff --git a/mingw-w64-crt/secapi/_vcprintf_s.c b/mingw-w64-crt/secapi/_vcprintf_s.c
index 34eb451..552c710 100644
--- a/mingw-w64-crt/secapi/_vcprintf_s.c
+++ b/mingw-w64-crt/secapi/_vcprintf_s.c
@@ -2,7 +2,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <msvcrt.h>
-#include <sec_api/conio_s.h>
+#include <conio.h>
 
 static int __cdecl _int_vcprintf_s (const char *, va_list);
 static int __cdecl _stub (const char *, va_list);

mingw-w64-crt/secapi/_vcprintf_s_l.c

diff --git a/mingw-w64-crt/secapi/_vcprintf_s_l.c b/mingw-w64-crt/secapi/_vcprintf_s_l.c
index bad4904..20a0a34 100644
--- a/mingw-w64-crt/secapi/_vcprintf_s_l.c
+++ b/mingw-w64-crt/secapi/_vcprintf_s_l.c
@@ -2,7 +2,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <msvcrt.h>
-#include <sec_api/conio_s.h>
+#include <conio.h>
 
 static int __cdecl _int_vcprintf_s_l (const char *, _locale_t, va_list);
 static int __cdecl _stub (const char *, _locale_t, va_list);

mingw-w64-headers/crt/conio.h

diff --git a/mingw-w64-headers/crt/conio.h b/mingw-w64-headers/crt/conio.h
index 44c3e0c..24ead00 100644
--- a/mingw-w64-headers/crt/conio.h
+++ b/mingw-w64-headers/crt/conio.h
@@ -19,6 +19,8 @@
 
   _CRTIMP char *__cdecl _cgets(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   _CRTIMP int __cdecl _cputs(const char *_Str);
+  _SECIMP errno_t __cdecl _cgets_s (char *_Buffer,size_t _Size,size_t *_SizeRead);
+  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _cgets_s, char, _Buffer, size_t*, _SizeRead)
 
 #ifndef	NO_OLDNAMES
   char *__cdecl cgets(char *_Buffer) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
@@ -54,6 +56,13 @@
  * Formatted console I/O functions.
  */
 
+  _SECIMP int __cdecl _cprintf_s (const char *_Format,...);
+  _SECIMP int __cdecl _cprintf_s_l (const char *_Format,_locale_t _Locale,...);
+  _SECIMP int __cdecl _vcprintf_s (const char *_Format,va_list _ArgList);
+  _SECIMP int __cdecl _vcprintf_s_l (const char *_Format,_locale_t _Locale,va_list _ArgList);
+  _CRTIMP int __cdecl _cscanf_s(const char *_Format,...);
+  _CRTIMP int __cdecl _cscanf_s_l(const char *_Format,_locale_t _Locale,...);
+
 #ifdef _UCRT
   int __cdecl __conio_common_vcprintf(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList);
   int __cdecl __conio_common_vcprintf_p(unsigned __int64 _Options, const char *_Format, _locale_t _Locale, va_list _ArgList);
@@ -193,6 +202,4 @@
 
 _CRT_END_C_HEADER
 
-#include <sec_api/conio_s.h>
-
 #endif

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

diff --git a/mingw-w64-headers/crt/sec_api/conio_s.h b/mingw-w64-headers/crt/sec_api/conio_s.h
deleted file mode 100644
index 49168e8..0000000
--- a/mingw-w64-headers/crt/sec_api/conio_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_CONIO_S
-#define _INC_CONIO_S
-
-#include <conio.h>
-
-_CRT_BEGIN_C_HEADER
-
-/**
- * Functions to read/write strings from/to console.
- */
-
-  _SECIMP errno_t __cdecl _cgets_s (char *_Buffer,size_t _Size,size_t *_SizeRead);
-  __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, _cgets_s, char, _Buffer, size_t*, _SizeRead)
-
-/**
- * Formatted console I/O functions.
- */
-
-  _SECIMP int __cdecl _cprintf_s (const char *_Format,...);
-  _SECIMP int __cdecl _cprintf_s_l (const char *_Format,_locale_t _Locale,...);
-  _SECIMP int __cdecl _vcprintf_s (const char *_Format,va_list _ArgList);
-  _SECIMP int __cdecl _vcprintf_s_l (const char *_Format,_locale_t _Locale,va_list _ArgList);
-  _CRTIMP int __cdecl _cscanf_s(const char *_Format,...);
-  _CRTIMP int __cdecl _cscanf_s_l(const char *_Format,_locale_t _Locale,...);
-
-_CRT_END_C_HEADER
-
-#endif