crtdefs.h: Added __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1 macro git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5209 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/crt/crtdefs.h b/mingw-w64-headers/crt/crtdefs.h index a7fb78b..1a7e87a 100644 --- a/mingw-w64-headers/crt/crtdefs.h +++ b/mingw-w64-headers/crt/crtdefs.h
@@ -37,6 +37,14 @@ } \ } +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(__ret,__func,__dsttype,__dst,__type1,__arg1) \ + extern "C++" {\ + template <size_t __size> \ + inline __ret __cdecl __func(__dsttype (&__dst)[__size], __type1 __arg1) { \ + return __func(__dst,__size,__arg1); \ + }\ + } + #define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2)\ extern "C++" {\ template <size_t __size> inline\ @@ -48,6 +56,7 @@ #else #define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_0(__ret,__func,__dsttype,__dst) +#define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(__ret,__func,__dsttype,__dst,__type1,__arg1) #define __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(__ret,__func,__dsttype,__dst,__type1,__arg1,__type2,__arg2) #endif
diff --git a/mingw-w64-headers/crt/sec_api/conio_s.h b/mingw-w64-headers/crt/sec_api/conio_s.h index e873cbd..ac506a0 100644 --- a/mingw-w64-headers/crt/sec_api/conio_s.h +++ b/mingw-w64-headers/crt/sec_api/conio_s.h
@@ -16,6 +16,8 @@ #endif _CRTIMP 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) + _CRTIMP int __cdecl _cprintf_s(const char *_Format,...); _CRTIMP int __cdecl _cscanf_s(const char *_Format,...); _CRTIMP int __cdecl _cscanf_s_l(const char *_Format,_locale_t _Locale,...); @@ -26,6 +28,8 @@ #ifndef _WCONIO_DEFINED_S #define _WCONIO_DEFINED_S _CRTIMP 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) + _CRTIMP int __cdecl _cwprintf_s(const wchar_t *_Format,...); _CRTIMP int __cdecl _cwscanf_s(const wchar_t *_Format,...); _CRTIMP int __cdecl _cwscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...);