Marged chris/win32/merge/07-win32-fixes at r210 to trunk

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/server/LocalProcessStream.cpp b/lib/server/LocalProcessStream.cpp
index f2a97c56..0de7bef4 100644
--- a/lib/server/LocalProcessStream.cpp
+++ b/lib/server/LocalProcessStream.cpp
@@ -9,7 +9,9 @@
 
 #include "Box.h"
 
+#ifndef WIN32
 #include <sys/socket.h>
+#endif
 #include <unistd.h>
 
 #include "LocalProcessStream.h"
@@ -36,6 +38,8 @@ std::auto_ptr<IOStream> LocalProcessStream(const char *CommandLine, pid_t &rPidO
 	// Split up command
 	std::vector<std::string> command;
 	SplitString(std::string(CommandLine), ' ', command);
+
+#ifndef WIN32
 	// Build arguments
 	char *args[MAX_ARGUMENTS + 4];
 	{
@@ -94,6 +98,11 @@ std::auto_ptr<IOStream> LocalProcessStream(const char *CommandLine, pid_t &rPidO
 	// Return the stream object and PID
 	rPidOut = pid;
 	return stream;	
+#else // WIN32
+	::syslog(LOG_ERR, "vfork not implemented - LocalProcessStream.cpp");
+	std::auto_ptr<IOStream> stream;
+	return stream;
+#endif // ! WIN32
 }