From 16f2e36162049ef583242e077c9dba9c5c22eb29 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Mon, 15 Sep 2014 05:46:55 -0700 Subject: [PATCH] Windows: MinGW does not define system function death() ... try using raise() instead as used by other exception cases. Also, fix include file order and wrapping to match squid-3 coding guidelines and available HAVE_ macro wrappers. --- src/win32.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/win32.cc b/src/win32.cc index 52b7e49628..7d68a2b8ae 100644 --- a/src/win32.cc +++ b/src/win32.cc @@ -9,16 +9,19 @@ /* Inspired by previous work by Romeo Anghelache & Eric Stern. */ #include "squid.h" -#include "win32.h" #if _SQUID_WINDOWS_ + +#include "fde.h" +#include "win32.h" + +#include #if HAVE_WIN32_PSAPI #include #endif -#ifndef _MSWSOCK_ +#if HAVE_MSWSOCK_H #include #endif -#include SQUIDCEXTERN LPCRITICAL_SECTION dbg_mutex; void WIN32_ExceptionHandlerCleanup(void); @@ -50,7 +53,7 @@ LONG CALLBACK WIN32_ExceptionHandler(EXCEPTION_POINTERS* ep) case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: case EXCEPTION_IN_PAGE_ERROR: - death(SIGBUS); + raise(SIGBUS); break; default: -- 2.47.2