diff options
| author | Ben Summers <ben@fluffy.co.uk> | 2005-12-01 15:11:21 +0000 |
|---|---|---|
| committer | Ben Summers <ben@fluffy.co.uk> | 2005-12-01 15:11:21 +0000 |
| commit | 9950474440f85c5a35be8cfe7a85cee884209f20 (patch) | |
| tree | 057f2d5cb134ac76563584620e243cafb2ad3980 | |
| parent | 15fe4e977048085cb929a50e0561b223cf95c9a9 (diff) | |
Build under Darwin
| -rwxr-xr-x | infrastructure/makeparcels.pl | 2 | ||||
| -rwxr-xr-x | lib/server/Daemon.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/infrastructure/makeparcels.pl b/infrastructure/makeparcels.pl index 29694326..1c0b0ead 100755 --- a/infrastructure/makeparcels.pl +++ b/infrastructure/makeparcels.pl @@ -65,6 +65,8 @@ print MAKE <<__E; # # +MAKE = $make_command + __E print MAKE "all:\t",join(' ',map {parcel_target($_)} @parcels),"\n\n"; diff --git a/lib/server/Daemon.cpp b/lib/server/Daemon.cpp index 1885c6c8..bb4ecd7c 100755 --- a/lib/server/Daemon.cpp +++ b/lib/server/Daemon.cpp @@ -144,7 +144,7 @@ int Daemon::Main(const char *DefaultConfigFile, int argc, const char *argv[]) struct sigaction sa; sa.sa_handler = SignalHandler; sa.sa_flags = 0; - ::sigemptyset(&sa.sa_mask); + sigemptyset(&sa.sa_mask); // macro if(::sigaction(SIGHUP, &sa, NULL) != 0 || ::sigaction(SIGTERM, &sa, NULL) != 0) { THROW_EXCEPTION(ServerException, DaemoniseFailed) @@ -361,7 +361,7 @@ void Daemon::EnterChild() struct sigaction sa; sa.sa_handler = SIG_DFL; sa.sa_flags = 0; - ::sigemptyset(&sa.sa_mask); + sigemptyset(&sa.sa_mask); // macro ::sigaction(SIGHUP, &sa, NULL); ::sigaction(SIGTERM, &sa, NULL); } |