[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/LOOLBroker.cpp

[Henry Castro]

 loolwsd/LOOLBroker.cpp |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c4a97a172b43272f97a215e26dbb45d82ec8943e
Author: Henry Castro <hcas...@collabora.com>
Date:   Sun Sep 27 17:18:33 2015 -0400

    loolwsd: change map childprocesses to store file descriptor FIFO

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 90f58ee..1eec9fa 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -62,7 +62,7 @@ const std::string BROKER_PREFIX = "/tmp/lokit";
 
 static unsigned int childCounter = 0;
 
-static std::map<Poco::Process::PID, Poco::UInt64> _childProcesses;
+static std::map<Poco::Process::PID, int> _childProcesses;
 
 namespace
 {
@@ -297,8 +297,9 @@ static int createLibreOfficeKit(bool sharePages, 
std::string loSubPath, Poco::UI
             return -1;
         }
     }
-    _childProcesses[child] = child;
-    return 0;
+
+    _childProcesses[child] = nFIFOWriter;
+    return child;
 }
 
 static void startupLibreOfficeKit(bool sharePages, int nLOKits,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits