diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2006-08-31 22:58:30 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2006-08-31 22:58:30 +0000 |
| commit | 7fb9db539446478122a8c3563a42699942c4d55e (patch) | |
| tree | 727fd2bcf4e623a7a076fe2df56866c751cb86ad | |
| parent | c038702ec1cf0e0bb4225356593bacbef3647c28 (diff) | |
Revert to trunk
| -rw-r--r-- | lib/server/ServerStream.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/server/ServerStream.h b/lib/server/ServerStream.h index 745c3ccb..8dafccae 100644 --- a/lib/server/ServerStream.h +++ b/lib/server/ServerStream.h @@ -56,10 +56,6 @@ public: return "generic-stream-server"; } - #ifdef WIN32 - virtual void OnIdle() { } - #endif - virtual void Run() { // Set process title as appropraite @@ -219,7 +215,6 @@ public: 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 @@ public: } 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 @@ public: } } while(p > 0); } - #endif // !WIN32 } } catch(...) @@ -313,11 +301,7 @@ protected: // depends on the forking model in case someone changes it later. bool WillForkToHandleRequests() { - #ifdef WIN32 - return false; - #else return ForkToHandleRequests; - #endif // WIN32 } private: |