*Should fix Linux build, thanks Drahy

--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-26 16:52:54 -07:00
parent 7396b641ae
commit c66005ea06
2 changed files with 5 additions and 7 deletions

View File

@@ -521,9 +521,9 @@ void Master::_OnSignal(int s)
break;
case SIGTERM:
#ifdef _WIN32
case SIGBREAK:
#endif
case SIGBREAK:
if (m_ServiceStatus != 1)
#endif
World::StopNow(SHUTDOWN_EXIT_CODE);
break;
}

View File

@@ -335,14 +335,12 @@ void OnSignal(int s)
{
case SIGINT:
case SIGTERM:
stopEvent = true;
break;
#ifdef _WIN32
case SIGBREAK:
if (m_ServiceStatus != 1)
#endif
stopEvent = true;
break;
#endif
}
signal(s, OnSignal);
@@ -375,7 +373,7 @@ void HookSignals()
signal(SIGTERM, OnSignal);
#ifdef _WIN32
if (m_ServiceStatus != 1)
signal(SIGBREAK, OnSignal);
signal(SIGBREAK, OnSignal);
#endif
}
@@ -386,7 +384,7 @@ void UnhookSignals()
signal(SIGTERM, 0);
#ifdef _WIN32
if (m_ServiceStatus != 1)
signal(SIGBREAK, 0);
signal(SIGBREAK, 0);
#endif
}