---
mingw-w64-headers/crt/memory.h | 1 +
mingw-w64-headers/crt/sec_api/memory_s.h | 26 --------------------------
mingw-w64-headers/crt/sec_api/string_s.h | 5 -----
mingw-w64-headers/crt/string.h | 1 +
4 files changed, 2 insertions(+), 31 deletions(-)
delete mode 100644 mingw-w64-headers/crt/sec_api/memory_s.h
diff --git a/mingw-w64-headers/crt/memory.h b/mingw-w64-headers/crt/memory.h
index 2afc51f..5699be5 100644
--- a/mingw-w64-headers/crt/memory.h
+++ b/mingw-w64-headers/crt/memory.h
@@ -27,6 +27,7 @@ extern "C" {
_CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale);
int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size);
void * __cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _Size) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
+ _CRTIMP errno_t __cdecl memcpy_s (void *_dest,size_t _numberOfElements,const void *_src,size_t _count);
void * __cdecl mempcpy (void *_Dst, const void *_Src, size_t _Size);
void * __cdecl memset(void *_Dst,int _Val,size_t _Size);
diff --git a/mingw-w64-headers/crt/sec_api/memory_s.h b/mingw-w64-headers/crt/sec_api/memory_s.h
deleted file mode 100644
index 53196d0..0000000
--- a/mingw-w64-headers/crt/sec_api/memory_s.h
+++ /dev/null
@@ -1,26 +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_MEMORY_S
-#define _INC_MEMORY_S
-
-#if defined(MINGW_HAS_SECURE_API)
-#include <memory.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /*__cplusplus*/
-
-#ifndef _MEMORY_S_DEFINED
-#define _MEMORY_S_DEFINED
- errno_t __cdecl memcpy_s (void *_dest,size_t _numberOfElements,const void *_src,size_t _count);
-#endif /*_MEMORY_S_DEFINED*/
-
-#ifdef __cplusplus
-}
-#endif /*__cplusplus*/
-
-#endif /*MINGW_HAS_SECURE_API*/
-#endif /*_INC_MEMORY_S*/
diff --git a/mingw-w64-headers/crt/sec_api/string_s.h b/mingw-w64-headers/crt/sec_api/string_s.h
index 1eac92e..7d36d91 100644
--- a/mingw-w64-headers/crt/sec_api/string_s.h
+++ b/mingw-w64-headers/crt/sec_api/string_s.h
@@ -65,11 +65,6 @@ extern "C" {
}
#endif
-#ifndef _MEMORY_S_DEFINED
-#define _MEMORY_S_DEFINED
- _CRTIMP errno_t __cdecl memcpy_s (void *_dest,size_t _numberOfElements,const void *_src,size_t _count);
-#endif /*_MEMORY_S_DEFINED*/
-
#ifdef __cplusplus
}
#endif
diff --git a/mingw-w64-headers/crt/string.h b/mingw-w64-headers/crt/string.h
index 16831e3..84c8d71 100644
--- a/mingw-w64-headers/crt/string.h
+++ b/mingw-w64-headers/crt/string.h
@@ -39,6 +39,7 @@ extern "C" {
_CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale);
int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size);
void * __cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _Size) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
+ _CRTIMP errno_t __cdecl memcpy_s (void *_dest,size_t _numberOfElements,const void *_src,size_t _count);
void * __cdecl mempcpy (void *_Dst, const void *_Src, size_t _Size);
void * __cdecl memset(void *_Dst,int _Val,size_t _Size);
#ifndef NO_OLDNAMES
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
