[Box Backup-dev] COMMIT r901 - box/chris/merge/lib/server

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-08-31 23:58:30 +0100 (Thu, 31 Aug 2006)
New Revision: 901

Modified:
   box/chris/merge/lib/server/ServerStream.h
Log:
Revert to trunk


Modified: box/chris/merge/lib/server/ServerStream.h
===================================================================
--- box/chris/merge/lib/server/ServerStream.h	2006-08-31 22:57:36 UTC (rev 900)
+++ box/chris/merge/lib/server/ServerStream.h	2006-08-31 22:58:30 UTC (rev 901)
@@ -56,10 +56,6 @@
 		return "generic-stream-server";
 	}
 
-	#ifdef WIN32
-	virtual void OnIdle() { }
-	#endif
-
 	virtual void Run()
 	{
 		// Set process title as appropraite
@@ -219,7 +215,6 @@
 					if(connection.get())
 					{
 						// Since this is a template parameter, the if() will be optimised out by the compiler
-						#ifndef WIN32 // no fork on Win32
 						if(ForkToHandleRequests)
 						{
 							pid_t pid = ::fork();
@@ -260,20 +255,14 @@
 						}
 						else
 						{
-						#endif // !WIN32
 							// Just handle in this connection
 							SetProcessTitle("handling");
 							HandleConnection(*connection);
 							SetProcessTitle("idle");										
-						#ifndef WIN32
 						}
-						#endif // !WIN32
 					}
 				}
-
-				#ifdef WIN32
-				OnIdle();
-				#else // !WIN32
+				
 				// Clean up child processes (if forking daemon)
 				if(ForkToHandleRequests)
 				{
@@ -288,7 +277,6 @@
 						}
 					} while(p > 0);
 				}
-				#endif // !WIN32
 			}
 		}
 		catch(...)
@@ -313,11 +301,7 @@
 	// depends on the forking model in case someone changes it later.
 	bool WillForkToHandleRequests()
 	{
-		#ifdef WIN32
-		return false;
-		#else
 		return ForkToHandleRequests;
-		#endif // WIN32
 	}
 
 private: