------------------------------------------------------------ revno: 13593 revision-id: squid3@treenet.co.nz-20140915124655-rmulughixxh6wvos parent: squid3@treenet.co.nz-20140915080658-2vdji3pg50imz5xr committer: Amos Jeffries branch nick: trunk timestamp: Mon 2014-09-15 05:46:55 -0700 message: 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. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140915124655-rmulughixxh6wvos # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: dc4984f39840a089601acf3e60a39654fec3c4da # timestamp: 2014-09-15 12:59:34 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140915080658-\ # 2vdji3pg50imz5xr # # Begin patch === modified file 'src/win32.cc' --- src/win32.cc 2014-09-13 13:59:43 +0000 +++ src/win32.cc 2014-09-15 12:46:55 +0000 @@ -9,16 +9,19 @@ /* Inspired by previous work by Romeo Anghelache & Eric Stern. */ #include "squid.h" + +#if _SQUID_WINDOWS_ + +#include "fde.h" #include "win32.h" -#if _SQUID_WINDOWS_ +#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 @@ case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: case EXCEPTION_IN_PAGE_ERROR: - death(SIGBUS); + raise(SIGBUS); break; default: