loolwsd/LOOLBroker.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 596948a121567371cf5c2654c2b7d31081284fe3
Author: Henry Castro <hcas...@collabora.com>
Date: Mon Aug 17 17:24:40 2015 -0400
loolwsd: replace ProcessHandle for UInt64
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 4c18ca3..992f691 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -248,10 +248,10 @@ static bool globalPreinit(const std::string &loSubPath)
static int createLibreOfficeKit(bool sharePages, std::string loSubPath,
Poco::UInt64 childID)
{
- ProcessHandle child;
+ Poco::UInt64 child;
if (sharePages)
{
- int pid;
+ Poco::UInt64 pid;
if (!(pid = fork()))
{ // child
run_lok_main(loSubPath, childID);
@@ -272,10 +272,10 @@ static int createLibreOfficeKit(bool sharePages,
std::string loSubPath, Poco::UI
std::cout << Util::logPrefix() + "Launching LibreOfficeKit: " +
executable + " " + Poco::cat(std::string(" "), args.begin(), args.end()) <<
std::endl;
- child = Process::launch(executable, args);
-
+ ProcessHandle procChild = Process::launch(executable, args);
+ child = procChild.id();
}
- _childProcesses[child.id()] = child.id();
+ _childProcesses[child] = child;
return 0;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
