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>

2 files changed, 8 insertions, 8 deletions

diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index e392f4ab3774..3eb9290a87fd 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.cxx
@@ -31,6 +31,9 @@
 extern "C" {
 #endif
 
+//From time.c
+void sal_initGlobalTimer();
+
 // _set_invalid_parameter_handler appears unavailable with MinGW:
 #if defined _MSC_VER
 namespace {
@@ -52,6 +55,7 @@ extern "C" void invalidParameterHandler(
 
 void sal_detail_initialize(int argc, char ** argv)
 {
+    sal_initGlobalTimer();
     // SetProcessDEPPolicy(PROCESS_DEP_ENABLE);
     // SetDllDirectoryW(L"");
     // SetSearchPathMode(
diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c
index 49f33c297c43..fc8855b53680 100644
--- a/sal/osl/w32/time.c
+++ b/sal/osl/w32/time.c
@@ -184,21 +184,17 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
     return sal_False;
 }
 
-
 static struct _timeb startTime;
-static sal_Bool bGlobalTimer = sal_False;
+void sal_initGlobalTimer()
+{
+    _ftime( &startTime );
+}
 
 sal_uInt32 SAL_CALL osl_getGlobalTimer(void)
 {
   struct _timeb currentTime;
   sal_uInt32 nSeconds;
 
-  if ( bGlobalTimer == sal_False )
-  {
-      _ftime( &startTime );
-      bGlobalTimer=sal_True;
-  }
-
   _ftime( &currentTime );
 
   nSeconds = (sal_uInt32)( currentTime.time - startTime.time );