headers: crt: merge search_s.h into search.h

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

mingw-w64-headers/crt/search.h

diff --git a/mingw-w64-headers/crt/search.h b/mingw-w64-headers/crt/search.h
index 1aa6a61..ccf8b67 100644
--- a/mingw-w64-headers/crt/search.h
+++ b/mingw-w64-headers/crt/search.h
@@ -24,6 +24,14 @@
   void *__cdecl lsearch(const void *_Key,void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
 #endif
 
+  _CRTIMP void *__cdecl _lfind_s(const void *_Key,const void *_Base,unsigned int *_NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context);
+  _CRTIMP void *__cdecl _lsearch_s(const void *_Key,void *_Base,unsigned int *_NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context);
+
+#ifndef _QSORT_S_DEFINED
+#define _QSORT_S_DEFINED
+  _CRTIMP void __cdecl qsort_s(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context);
+#endif
+
 /*
 Documentation for these POSIX definitions and prototypes can be found in 
 The Open Group Base Specifications Issue 6
@@ -66,6 +74,4 @@
 
 _CRT_END_C_HEADER
 
-#include <sec_api/search_s.h>
-
 #endif

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

diff --git a/mingw-w64-headers/crt/sec_api/search_s.h b/mingw-w64-headers/crt/sec_api/search_s.h
deleted file mode 100644
index d56b9d1..0000000
--- a/mingw-w64-headers/crt/sec_api/search_s.h
+++ /dev/null
@@ -1,23 +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_SEARCH_S
-#define _INC_SEARCH_S
-
-#include <search.h>
-
-_CRT_BEGIN_C_HEADER
-
-  _CRTIMP void *__cdecl _lfind_s(const void *_Key,const void *_Base,unsigned int *_NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context);
-  _CRTIMP void *__cdecl _lsearch_s(const void *_Key,void *_Base,unsigned int *_NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context);
-
-#ifndef _QSORT_S_DEFINED
-#define _QSORT_S_DEFINED
-  _CRTIMP void __cdecl qsort_s(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context);
-#endif
-
-_CRT_END_C_HEADER
-
-#endif