loolwsd/LOOLWSD.cpp | 14 ------------
loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h | 2 -
2 files changed, 1 insertion(+), 15 deletions(-)
New commits:
commit fd5b676b2d9b161158515d7c9bcc260a8abd2678
Author: Henry Castro <hcas...@collabora.com>
Date: Wed Jul 15 20:57:39 2015 -0400
loolwsd: set RTLD_NOW, all undefined symbols in
the library are resolved before dlopen() returns.
Also remove unnecessary commented code.
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 77be226..f6b8457 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -997,20 +997,6 @@ void LOOLWSD::desktopMain()
Thread::sleep(std::stoul(std::getenv("SLEEPFORDEBUGGER")) * 1000);
}
- // TODO loKit SolarMutex is locked, it ends deadlock
-/*
-#ifdef __APPLE__
- LibreOfficeKit *loKit(lok_init_2(("/" + loSubPath +
"/Frameworks").c_str(), "file:///user"));
-#else
- LibreOfficeKit *loKit(lok_init_2(("/" + loSubPath + "/program").c_str(),
"file:///user"));
-#endif
-
- if (!loKit)
- {
- logger().fatal(Util::logPrefix() + "LibreOfficeKit initialisation
failed");
- exit(Application::EXIT_UNAVAILABLE);
- }*/
-
namedMutexLOOL.lock();
startupComponent(_numPreSpawnedChildren);
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index f1966c7..0445fdf 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -42,7 +42,7 @@ extern "C"
void *_dlopen(const char *pFN)
{
- return dlopen(pFN, RTLD_LAZY
+ return dlopen(pFN, RTLD_NOW
#if defined __clang__ && defined __linux__ \
&& defined ENABLE_RUNTIME_OPTIMIZATIONS
#if !ENABLE_RUNTIME_OPTIMIZATIONS
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
