loolwsd/LOOLBroker.cpp | 2 +-
loolwsd/LOOLWSD.cpp | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 73282c50d6c39b7b5788bee4c2a0bc01a3887793
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Mar 2 08:26:15 2016 +0200
Make preinit the default. Turn off with LOK_NO_PREINIT
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 0ac53c8..ddeb815 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -775,7 +775,7 @@ int main(int argc, char** argv)
}
// Initialize LoKit and hope we can fork and save memory by sharing pages.
- const bool sharePages = std::getenv("LOK_PREINIT") != nullptr
+ const bool sharePages = std::getenv("LOK_NO_PREINIT") == nullptr
? globalPreinit(loTemplate)
: std::getenv("LOK_FORK") != nullptr;
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 69a3774..c5d3cc3 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -911,7 +911,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
return Application::EXIT_USAGE;
}
- //Environment::set("LOK_PREINIT", "1");
//Environment::set("LOK_FORK", "1");
//Environment::set("LD_BIND_NOW", "1");
//Environment::set("LOK_VIEW_CALLBACK", "1");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
