summaryrefslogtreecommitdiff
path: root/sal/osl/unx/salinit.cxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2013-05-19 18:09:21 -0500
committerFridrich Strba <fridrich@documentfoundation.org>2013-05-20 10:31:14 +0000
commitd8d55787b81cdc955b73c8befa4ab608f46e32aa (patch)
tree49c824ede45e247105e44990fe3f46d74d6c1f1f /sal/osl/unx/salinit.cxx
parent235941bcd0e59c2831d5bc28683119eb6a2fd982 (diff)
Thread-safe version of osl_getGlobalTime
Change-Id: Ibb9d23780600437f607d866ff3d396b96879245d Reviewed-on: https://gerrit.libreoffice.org/3960 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'sal/osl/unx/salinit.cxx')
-rw-r--r--sal/osl/unx/salinit.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 327ca0e0d0c5..c71c6a3d67ac 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -38,6 +38,9 @@ extern bool sal_use_syslog;
extern "C" {
+//From time.c
+void sal_initGlobalTimer();
+
void sal_detail_initialize(int argc, char ** argv) {
#if defined MACOSX
// On Mac OS X, soffice can restart itself via exec (see restartOnMac in
@@ -64,6 +67,7 @@ void sal_detail_initialize(int argc, char ** argv) {
close(fd);
}
#endif
+ sal_initGlobalTimer();
#if HAVE_SYSLOG_H
const char *use_syslog = getenv("SAL_LOG_SYSLOG");
sal_use_syslog = use_syslog != NULL && !strcmp(use_syslog, "1");