wsd/LOOLWSD.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 39311fdae3658d563adbb8c1844823956a8cd666
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Fri Feb 7 14:14:21 2020 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Fri Feb 7 16:39:55 2020 +0100
remove poco Environment call.
Change-Id: I967a42aa3b8a3b9fc44b3dffedef98adc4b94724
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88198
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7fa1898ec..518770979 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -8,7 +8,6 @@
*/
#include <config.h>
-
#include "LOOLWSD.hpp"
#include "ProofKey.hpp"
@@ -37,6 +36,7 @@
// number of child processes, each which handles a viewing (editing) session
for one document.
#include <unistd.h>
+#include <stdlib.h>
#include <sysexits.h>
#include <sys/stat.h>
@@ -84,7 +84,6 @@ using Poco::Net::PartHandler;
#include <Poco/DOM/NodeList.h>
#include <Poco/DateTimeFormatter.h>
#include <Poco/DirectoryIterator.h>
-#include <Poco/Environment.h>
#include <Poco/Exception.h>
#include <Poco/File.h>
#include <Poco/FileStream.h>
@@ -157,7 +156,6 @@ using Poco::Net::PartHandler;
using namespace LOOLProtocol;
using Poco::DirectoryIterator;
-using Poco::Environment;
using Poco::Exception;
using Poco::File;
using Poco::Net::HTTPRequest;
@@ -3351,7 +3349,7 @@ int LOOLWSD::innerMain()
#ifdef __linux
// down-pay all the forkit linking cost once & early.
- Environment::set("LD_BIND_NOW", "1");
+ setenv("LD_BIND_NOW", "1", 1);
#if !MOBILEAPP
HostIdentifier = Util::rng::getHexString(8);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
