You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/04/09 23:26:00 UTC
svn commit: r932621 - in
/subversion/trunk/subversion/bindings/javahl/native: CreateJ.cpp CreateJ.h
SVNClient.cpp StatusCallback.cpp StatusCallback.h
Author: hwright
Date: Fri Apr 9 21:26:00 2010
New Revision: 932621
URL: http://svn.apache.org/viewvc?rev=932621&view=rev
Log:
JavaHL: Fix the JavaHL build by updating references to svn_wc_status3_t.
* subversion/bindings/javahl/native/CreateJ.cpp
* subversion/bindings/javahl/native/CreateJ.h
(Status),
* subversion/bindings/javahl/native/StatusCallback.cpp
* subversion/bindings/javahl/native/StatusCallback.h
(doStatus, callback),
* subversion/bindings/javahl/native/SVNClient.cpp
(analyze_status): Switch types to svn_wc_status3_t.
Modified:
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/CreateJ.h
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=932621&r1=932620&r2=932621&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Fri Apr 9 21:26:00 2010
@@ -431,7 +431,7 @@ CreateJ::Lock(const svn_lock_t *lock)
}
jobject
-CreateJ::Status(const char *local_abspath, const svn_wc_status2_t *status)
+CreateJ::Status(const char *local_abspath, const svn_wc_status3_t *status)
{
JNIEnv *env = JNIUtil::getEnv();
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.h?rev=932621&r1=932620&r2=932621&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.h Fri Apr 9 21:26:00 2010
@@ -54,7 +54,7 @@ class CreateJ
Lock(const svn_lock_t *lock);
static jobject
- Status(const char *local_abspath, const svn_wc_status2_t *status);
+ Status(const char *local_abspath, const svn_wc_status3_t *status);
static jobject
NotifyInformation(const svn_wc_notify_t *notify);
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=932621&r1=932620&r2=932621&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Fri Apr 9 21:26:00 2010
@@ -1693,7 +1693,7 @@ cancel(void *baton)
static svn_error_t *
analyze_status(void *baton,
const char *local_abspath,
- const svn_wc_status2_t *status,
+ const svn_wc_status3_t *status,
apr_pool_t *pool)
{
struct version_status_baton *sb = (version_status_baton *)baton;
Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp?rev=932621&r1=932620&r2=932621&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp Fri Apr 9 21:26:00 2010
@@ -51,7 +51,7 @@ StatusCallback::~StatusCallback()
svn_error_t *
StatusCallback::callback(void *baton,
const char *local_abspath,
- const svn_wc_status2_t *status,
+ const svn_wc_status3_t *status,
apr_pool_t *pool)
{
if (baton)
@@ -65,7 +65,7 @@ StatusCallback::callback(void *baton,
*/
svn_error_t *
StatusCallback::doStatus(const char *local_abspath,
- const svn_wc_status2_t *status)
+ const svn_wc_status3_t *status)
{
JNIEnv *env = JNIUtil::getEnv();
Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h?rev=932621&r1=932620&r2=932621&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.h Fri Apr 9 21:26:00 2010
@@ -42,12 +42,12 @@ class StatusCallback
static svn_error_t* callback(void *baton,
const char *local_abspath,
- const svn_wc_status2_t *status,
+ const svn_wc_status3_t *status,
apr_pool_t *pool);
protected:
svn_error_t *doStatus(const char *local_abspath,
- const svn_wc_status2_t *status);
+ const svn_wc_status3_t *status);
private:
/**