From 6da850916536a50d6a9c82d5dcda5264b7d5631d Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 10 May 2004 14:57:39 +0000
Subject: INTEGRATION: CWS nwf (1.7.66); FILE MERGED 2004/03/25 10:59:22 mmeeks
1.7.66.1: Fix a number of nasty bugs, bring the glib/gtk+ and VCL mainloops
to parity so inferior loops work correctly, fix a number of nasty threading /
race bugs. Reviewed by: pl
---
vcl/unx/source/app/saltimer.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'vcl/unx')
diff --git a/vcl/unx/source/app/saltimer.cxx b/vcl/unx/source/app/saltimer.cxx
index 0dc92745469b..b4695082e1a9 100644
--- a/vcl/unx/source/app/saltimer.cxx
+++ b/vcl/unx/source/app/saltimer.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: saltimer.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: vg $ $Date: 2004-01-06 14:33:07 $
+ * last change: $Author: hr $ $Date: 2004-05-10 15:57:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,14 +94,14 @@ void SalData::Timeout() const
// -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-inline void SalXLib::StopTimer()
+void SalXLib::StopTimer()
{
Timeout_.tv_sec = 0;
Timeout_.tv_usec = 0;
nTimeoutMS_ = 0;
}
-inline void SalXLib::StartTimer( ULONG nMS )
+void SalXLib::StartTimer( ULONG nMS )
{
timeval Timeout (Timeout_); // previous timeout.
gettimeofday (&Timeout_, 0);
--
cgit