From 70394d3f40c3b3ddc10e70a5d9d281a3e433707c Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 22 Feb 2015 00:50:52 +0000 Subject: [PATCH] --- MagickCore/magick.c | 4 ++-- MagickCore/nt-base.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/MagickCore/magick.c b/MagickCore/magick.c index 6f692fcc2..744215072 100644 --- a/MagickCore/magick.c +++ b/MagickCore/magick.c @@ -1262,7 +1262,7 @@ static void MagickSignalHandler(int signal_number) if (signal_number == SIGHUP) exit(signal_number); #endif -#if defined(SIGINT) && !defined(MAGICKCORE_WINDOWS_SUPPORT) +#if defined(SIGINT) if (signal_number == SIGINT) exit(signal_number); #endif @@ -1362,7 +1362,7 @@ MagickExport void MagickCoreGenesis(const char *path, if (signal_handlers[SIGHUP] == (SignalHandler *) NULL) signal_handlers[SIGHUP]=RegisterMagickSignalHandler(SIGHUP); #endif -#if defined(SIGINT) && !defined(MAGICKCORE_WINDOWS_SUPPORT) +#if defined(SIGINT) if (signal_handlers[SIGINT] == (SignalHandler *) NULL) signal_handlers[SIGINT]=RegisterMagickSignalHandler(SIGINT); #endif diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index 018419563..79cc0e4b7 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -1704,7 +1704,7 @@ static UINT ChangeErrorMode(void) UINT mode; - mode=SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX; + mode=SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX; handle=GetModuleHandle("kernel32.dll"); if (handle == (HMODULE) NULL) @@ -1712,8 +1712,7 @@ static UINT ChangeErrorMode(void) getErrorMode=(GETERRORMODE) NTGetLibrarySymbol(handle,"GetErrorMode"); if (getErrorMode != (GETERRORMODE) NULL) - mode=getErrorMode() | SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | - SEM_NOOPENFILEERRORBOX; + mode=getErrorMode() | SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX; return SetErrorMode(mode); } -- 2.40.0