[Box Backup-commit] COMMIT r1394 - box/chris/general/lib/server
boxbackup-dev@fluffy.co.uk
boxbackup-dev@fluffy.co.uk
Sat, 10 Mar 2007 17:01:42 +0000
Author: chris
Date: 2007-03-10 17:01:42 +0000 (Sat, 10 Mar 2007)
New Revision: 1394
Modified:
box/chris/general/lib/server/ServerStream.h
Log:
Merge back changes from merge tree (call OnIdle() when idle on all platforms,
not just Win32)
Modified: box/chris/general/lib/server/ServerStream.h
===================================================================
--- box/chris/general/lib/server/ServerStream.h 2007-03-10 17:00:17 UTC (rev 1393)
+++ box/chris/general/lib/server/ServerStream.h 2007-03-10 17:01:42 UTC (rev 1394)
@@ -269,9 +269,9 @@
}
}
- #ifdef WIN32
OnIdle();
- #else // !WIN32
+
+ #ifndef WIN32
// Clean up child processes (if forking daemon)
if(ForkToHandleRequests)
{
@@ -286,7 +286,7 @@
}
} while(p > 0);
}
- #endif // WIN32
+ #endif // !WIN32
}
}
catch(...)