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

1 files changed, 13 insertions, 1 deletions

diff --git a/bin/bbackupd/BackupDaemon.h b/bin/bbackupd/BackupDaemon.h
index ffaf5783..e6798798 100755
--- a/bin/bbackupd/BackupDaemon.h
+++ b/bin/bbackupd/BackupDaemon.h
@@ -19,6 +19,7 @@
 #include "Socket.h"
 #include "SocketListen.h"
 #include "SocketStream.h"
+#include "WinNamedPipeStream.h"
 
 class BackupClientDirectoryRecord;
 class BackupClientContext;
@@ -146,8 +147,12 @@ private:
 		CommandSocketInfo(const CommandSocketInfo &);	// no copying
 		CommandSocketInfo &operator=(const CommandSocketInfo &);
 	public:
+#ifdef WIN32
+		WinNamedPipeStream mListeningSocket;
+#else
 		SocketListen<SocketStream, 1 /* listen backlog */> mListeningSocket;
 		std::auto_ptr<SocketStream> mpConnectedSocket;
+#endif
 		IOStreamGetLine *mpGetLine;
 	};
 	
@@ -160,7 +165,14 @@ private:
 	// Unused entries in the root directory wait a while before being deleted
 	box_time_t mDeleteUnusedRootDirEntriesAfter;	// time to delete them
 	std::vector<std::pair<int64_t,std::string> > mUnusedRootDirEntries;
+
+#ifdef WIN32
+	public:
+	void RunHelperThread(void);
+
+	private:
+	bool mDoSyncFlagOut, mSyncIsForcedOut, mReceivedCommandConn;
+#endif
 };
 
 #endif // BACKUPDAEMON__H
-