Changeset 901

Timestamp:

31/08/2006 23:58:30 (5 years ago)

Author:

chris

Message:

Revert to trunk

File:

• box/chris/merge/lib/server/ServerStream.h (modified) (5 diffs)

box/chris/merge/lib/server/ServerStream.h

@@ -57 +57 @@
         }
 
-        #ifdef WIN32
-        virtual void OnIdle() { }
-        #endif
-
         virtual void Run()
         {
@@ -220 +216 @@
                                         {
                                                 // Since this is a template parameter, the if() will be optimised out by the compiler
-                                                #ifndef WIN32 // no fork on Win32
                                                 if(ForkToHandleRequests)
                                                 {
@@ -261 +256 @@
                                                 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)
@@ -289 +278 @@
                                         } while(p > 0);
                                 }
-                                #endif // !WIN32
                         }
                 }
@@ -314 +302 @@
         bool WillForkToHandleRequests()
         {
-                #ifdef WIN32
-                return false;
-                #else
                 return ForkToHandleRequests;
-                #endif // WIN32
         }