You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/09/07 12:30:35 UTC
svn commit: r1520753 -
/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
Author: rhuijben
Date: Sat Sep 7 10:30:34 2013
New Revision: 1520753
URL: http://svn.apache.org/r1520753
Log:
* subversion/bindings/javahl/native/JNIUtil.cpp
(includes): Remove the apr.h added in r1520752 as it doesn't fix the build
problem.
(GlobalInitGuard::GlobalInitGuard): Initialize apr time in a different way,
while still wondering why we don't use svn_atomic__init_once() here.
Modified:
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1520753&r1=1520752&r2=1520753&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Sat Sep 7 10:30:34 2013
@@ -31,7 +31,6 @@
#include <vector>
#include <locale.h>
-#include <apr.h>
#include <apr_strings.h>
#include <apr_tables.h>
#include <apr_general.h>
@@ -143,7 +142,7 @@ struct GlobalInitGuard
m_state == state_init && shift < 8;
++shift)
{
- apr_sleep((APR_USEC_PER_SEC / 1000) << shift);
+ apr_sleep(apr_time_from_msec(1) << shift);
m_state = InitState(svn_atomic_cas(&m_global_state,
state_null, state_null));
}