From f1d851b7cd736c661f62f8d697a7726439e35453 Mon Sep 17 00:00:00 2001
From: Gavin Hurlbut <ghurlbut@mythtv.org>
Date: Mon, 1 Oct 2012 15:03:56 -0700
Subject: [PATCH] More windows-related fixes.

---
 mythtv/libs/libmythbase/signalhandling.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mythtv/libs/libmythbase/signalhandling.cpp b/mythtv/libs/libmythbase/signalhandling.cpp
index 95370ccfd3e..2330b247083 100644
--- a/mythtv/libs/libmythbase/signalhandling.cpp
+++ b/mythtv/libs/libmythbase/signalhandling.cpp
@@ -63,6 +63,7 @@ SignalHandler::SignalHandler(QList<int> &signallist, QObject *parent) :
     s_exit_program = false; // set here due to "C++ static initializer madness"
     sig_str_init();
 
+#ifndef _WIN32
     m_sigStack = new char[SIGSTKSZ];
     stack_t stack;
     stack.ss_sp = m_sigStack;
@@ -76,15 +77,14 @@ SignalHandler::SignalHandler(QList<int> &signallist, QObject *parent) :
         delete [] m_sigStack;
         m_sigStack = NULL;
     }
+#endif
 
     if (s_defaultHandlerList.isEmpty())
         s_defaultHandlerList << SIGINT << SIGTERM << SIGSEGV << SIGABRT
+                             << SIGFPE << SIGILL;
 #ifndef _WIN32
-                             << SIGBUS 
-#endif
-                             << SIGFPE << SIGILL << SIGRTMIN;
+        s_defaultHandlerList << SIGBUS << SIGRTMIN;
 
-#ifndef _WIN32
     if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigFd))
     {
         cerr << "Couldn't create socketpair" << endl;
@@ -204,6 +204,10 @@ void SignalHandler::signalHandler(int signum, siginfo_t *info, void *context)
 {
     SignalInfo signalInfo;
 
+#ifdef _WIN32
+    info = NULL;
+#endif
+
     (void)context;
     signalInfo.signum = signum;
     signalInfo.code   = (info ? info->si_code : 0);