headers: crt: merge crtdbg_s.h into crtdbg.h

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

mingw-w64-headers/crt/crtdbg.h

diff --git a/mingw-w64-headers/crt/crtdbg.h b/mingw-w64-headers/crt/crtdbg.h
index 900dcf3..019441e 100644
--- a/mingw-w64-headers/crt/crtdbg.h
+++ b/mingw-w64-headers/crt/crtdbg.h
@@ -165,6 +165,8 @@
 #define _malloca_dbg(s,t,f,l) _malloca(s)
 #define _freea_dbg(p,t) _freea(p)
 
+#define _dupenv_s_dbg(ps1,size,s2,t,f,l) _dupenv_s(ps1,size,s2)
+#define _wdupenv_s_dbg(ps1,size,s2,t,f,l) _wdupenv_s(ps1,size,s2)
 #define _strdup_dbg(s,t,f,l) _strdup(s)
 #define _wcsdup_dbg(s,t,f,l) _wcsdup(s)
 #define _mbsdup_dbg(s,t,f,l) _mbsdup(s)
@@ -443,6 +445,4 @@
   inline void __cdecl operator delete[](void *_P,int,const char *,int) { ::operator delete[](_P); }
  */
 
-#include <sec_api/crtdbg_s.h>
-
 #endif

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

diff --git a/mingw-w64-headers/crt/sec_api/crtdbg_s.h b/mingw-w64-headers/crt/sec_api/crtdbg_s.h
deleted file mode 100644
index 4916438..0000000
--- a/mingw-w64-headers/crt/sec_api/crtdbg_s.h
+++ /dev/null
@@ -1,15 +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_CRTDBG_S
-#define _INC_CRTDBG_S
-
-#include <crtdbg.h>
-
-#define _dupenv_s_dbg(ps1,size,s2,t,f,l) _dupenv_s(ps1,size,s2)
-#define _wdupenv_s_dbg(ps1,size,s2,t,f,l) _wdupenv_s(ps1,size,s2)
-
-#endif