[Box Backup-dev] COMMIT r367 - in box/chris/win32/vc2005-compile-fixes: bin/bbackupd lib/win32

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-02-03 20:45:29 +0000 (Fri, 03 Feb 2006)
New Revision: 367

Modified:
   box/chris/win32/vc2005-compile-fixes/bin/bbackupd/BackupClientContext.cpp
   box/chris/win32/vc2005-compile-fixes/lib/win32/emu.cpp
   box/chris/win32/vc2005-compile-fixes/lib/win32/emu.h
Log:
* lib/win32/emu.cpp
* lib/win32/emu.h
* bin/bbackupd/BackupClientContext.cpp
- Removed (possibly bogus and confusing) definitions of SIG(VT)ALRM on Win32


Modified: box/chris/win32/vc2005-compile-fixes/bin/bbackupd/BackupClientContext.cpp
===================================================================
--- box/chris/win32/vc2005-compile-fixes/bin/bbackupd/BackupClientContext.cpp	2006-02-03 20:25:21 UTC (rev 366)
+++ box/chris/win32/vc2005-compile-fixes/bin/bbackupd/BackupClientContext.cpp	2006-02-03 20:45:29 UTC (rev 367)
@@ -511,6 +511,9 @@
 
 #ifdef PLATFORM_CYGWIN
 	::signal(SIGALRM, TimerSigHandler);
+#elif WIN32
+	// no support for SIGVTALRM
+	SetTimerHandler(TimerSignalHandler);
 #else
 	::signal(SIGVTALRM, TimerSigHandler);
 #endif // PLATFORM_CYGWIN

Modified: box/chris/win32/vc2005-compile-fixes/lib/win32/emu.cpp
===================================================================
--- box/chris/win32/vc2005-compile-fixes/lib/win32/emu.cpp	2006-02-03 20:25:21 UTC (rev 366)
+++ box/chris/win32/vc2005-compile-fixes/lib/win32/emu.cpp	2006-02-03 20:45:29 UTC (rev 367)
@@ -41,7 +41,7 @@
 
 int setitimer(int type , struct itimerval *timeout, int)
 {
-	if ( SIGVTALRM == type || ITIMER_VIRTUAL == type )
+	if (ITIMER_VIRTUAL == type)
 	{
 		EnterCriticalSection(&gLock);
 		// we only need seconds for the mo!

Modified: box/chris/win32/vc2005-compile-fixes/lib/win32/emu.h
===================================================================
--- box/chris/win32/vc2005-compile-fixes/lib/win32/emu.h	2006-02-03 20:25:21 UTC (rev 366)
+++ box/chris/win32/vc2005-compile-fixes/lib/win32/emu.h	2006-02-03 20:45:29 UTC (rev 367)
@@ -27,9 +27,6 @@
 	( *(_result) = *gmtime( (_clock) ), \
 	(_result) )
 
-//signal in unix SIGVTALRM does not exist in win32 - but looking at the 
-#define SIGVTALRM 254
-#define SIGALRM SIGVTALRM
 #define ITIMER_VIRTUAL 0
 
 #ifdef _MSC_VER