Rebase resync

This commit is contained in:
Antz 2020-02-17 09:19:44 +00:00
parent a0797532e8
commit 1997c1e903
3106 changed files with 11118 additions and 627576 deletions

View file

@ -1,10 +1,10 @@
/*
/**
* This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -45,7 +45,6 @@ void daemonSignal(int s)
exit(EXIT_FAILURE);
}
void startDaemon(uint32_t timeout)
{
parent_pid = getpid();
@ -120,7 +119,6 @@ void detachDaemon()
}
}
void exitDaemon()
{
if (parent_pid && parent_pid != getpid())
@ -129,7 +127,6 @@ void exitDaemon()
}
}
struct WatchDog
{
~WatchDog()