From 2367dca1e9b7dee9286b3e990498ce1117b1289d Mon Sep 17 00:00:00 2001 From: dkulwin Date: Thu, 5 Nov 2015 15:01:06 -0600 Subject: [PATCH] Disable invalid parameter handler use under mingw Mingw doesn't support the invalid parameter handler function in the same way as visual studio. Shouldn't be needed under mingw anyway. --- contrib/win32/win32compat/sfds.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/win32/win32compat/sfds.c b/contrib/win32/win32compat/sfds.c index cfaeffd..2863cc0 100644 --- a/contrib/win32/win32compat/sfds.c +++ b/contrib/win32/win32compat/sfds.c @@ -55,7 +55,7 @@ static int sfd_map_init = 0; static int sfd_count = 0; int sfd_start = 0; - +#ifndef __MINGW32__ void myInvalidParameterHandler(const wchar_t* expression, const wchar_t* function, const wchar_t* file, @@ -64,6 +64,7 @@ void myInvalidParameterHandler(const wchar_t* expression, { return; } +#endif /* @@ -151,14 +152,17 @@ int allocate_sfd(int fd_or_handle) else #endif - +#ifndef __MINGW32__ _invalid_parameter_handler oldHandler, newHandler; newHandler = myInvalidParameterHandler; oldHandler = _set_invalid_parameter_handler(newHandler); +#endif real_handle = (HANDLE)_get_osfhandle(fd_or_handle); +#ifndef __MINGW32__ _set_invalid_parameter_handler(oldHandler); +#endif if (real_handle == INVALID_HANDLE_VALUE) {