summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-10-29 10:30:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-10-29 16:27:26 +0100
commit13c0326d237cb4860b121ceba8ecb04fe96ae479 (patch)
tree47dcb0c2690c44bd42cbd468b8339eef5885aaac /ucb/source
parent7774d01891df6787058677dee4bc449cd5841c59 (diff)
ne_lock::timeout is of type long, so keep using that here
...partially reverting 4fbd63860500b2db76df4d5aedbe5e3aa31fac69 "switching long to a 64-bit type on 64-bit windows" Change-Id: I858630e5de76942a001ba619085ee07183df6ff6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104994 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 4e9012a990dc..b914f41cd903 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -34,7 +34,6 @@
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <osl/time.h>
-#include <tools/long.hxx>
#include <ne_socket.h>
#include <ne_auth.h>
#include <ne_redirect.h>
@@ -1569,7 +1568,7 @@ void NeonSession::LOCK( const OUString & inPath,
}
// Set the lock timeout
- theLock->timeout = static_cast<tools::Long>(rLock.Timeout);
+ theLock->timeout = static_cast<long>(rLock.Timeout);
// Set the lock owner
OUString aValue;
@@ -1629,7 +1628,7 @@ bool NeonSession::LOCK( NeonLock * pLock,
// save the current requested timeout, because ne_lock_refresh uses
// pLock->timeout as an out parameter. This prevents a feedback-loop,
// where we would request a shorter timeout on each refresh.
- tools::Long timeout = pLock->timeout;
+ long timeout = pLock->timeout;
const int theRetVal = ne_lock_refresh(m_pHttpSession, pLock);
if (theRetVal == NE_OK)
{