[Box Backup-commit] COMMIT r1902 - box/trunk/lib/common

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Sat, 03 Nov 2007 00:47:21 +0000


Author: chris
Date: 2007-11-03 00:47:20 +0000 (Sat, 03 Nov 2007)
New Revision: 1902

Modified:
   box/trunk/lib/common/Timer.cpp
Log:
sigemptyset() is a macro on OSX 10.3, so don't prepend ::


Modified: box/trunk/lib/common/Timer.cpp
===================================================================
--- box/trunk/lib/common/Timer.cpp	2007-10-23 11:11:05 UTC (rev 1901)
+++ box/trunk/lib/common/Timer.cpp	2007-11-03 00:47:20 UTC (rev 1902)
@@ -42,7 +42,7 @@
 		struct sigaction newact, oldact;
 		newact.sa_handler = Timers::SignalHandler;
 		newact.sa_flags = SA_RESTART;
-		::sigemptyset(&newact.sa_mask);
+		sigemptyset(&newact.sa_mask);
 		if (::sigaction(SIGALRM, &newact, &oldact) != 0)
 		{
 			BOX_ERROR("Failed to install signal handler");
@@ -80,7 +80,7 @@
 		struct sigaction newact, oldact;
 		newact.sa_handler = SIG_DFL;
 		newact.sa_flags = SA_RESTART;
-		::sigemptyset(&newact.sa_mask);
+		sigemptyset(&(newact.sa_mask));
 		if (::sigaction(SIGALRM, &newact, &oldact) != 0)
 		{
 			BOX_ERROR("Failed to remove signal handler");