Author: stefan2
Date: Thu Apr 12 10:18:47 2012
New Revision: 1325186
URL: http://svn.apache.org/viewvc?rev=1325186&view=rev
Log:
On the reprop-cache branch: Fix various build issues.
* subversion/libsvn_subr/svn_named_atomic.c
(lock): empty parameter list must be void
(svn_atomic_namespace__create): forgot to rename pool -> result_pool
(svn_named_atomic__get): lock() doesn't take any parameters
Modified:
subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c
Modified:
subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c
URL:
http://svn.apache.org/viewvc/subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c?rev=1325186&r1=1325185&r2=1325186&view=diff
==============================================================================
--- subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c
(original)
+++ subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c
Thu Apr 12 10:18:47 2012
@@ -242,7 +242,7 @@ init_mutex(void *baton, apr_pool_t *_poo
/* Utility that acquires our global mutex and converts error types.
*/
static svn_error_t *
-lock()
+lock(void)
{
apr_status_t apr_err = apr_global_mutex_lock(mutex);
if (apr_err)
@@ -364,7 +364,7 @@ svn_atomic_namespace__create(svn_atomic_
apr_pool_t *result_pool)
{
svn_atomic_namespace__t *new_namespace
- = apr_pcalloc(pool, sizeof(*new_namespace));
+ = apr_pcalloc(result_pool, sizeof(*new_namespace));
new_namespace->name = apr_pstrdup(result_pool, name);
SVN_ERR(initialize(new_namespace, result_pool));
@@ -418,7 +418,7 @@ svn_named_atomic__get(svn_named_atomic__
/* Try harder:
* Serialize all lookup and insert the item, if necessary and allowed.
*/
- SVN_ERR(lock(ns));
+ SVN_ERR(lock());
/* We only need to check for new entries.
*/
