Author: rhuijben
Date: Tue Feb 24 23:06:53 2015
New Revision: 1662137
URL: http://svn.apache.org/r1662137
Log:
* subversion/libsvn_wc/conflicts.c
(svn_wc__resolve_conflicts): Fix C89/C90 issue by moving variable
declaration.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1662137&r1=1662136&r2=1662137&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Feb 24 23:06:53 2015
@@ -3100,8 +3100,8 @@ svn_wc__resolve_conflicts(svn_wc_context
for (; hi && !err; hi = apr_hash_next(hi))
{
- svn_pool_clear(iterpool);
const char *relpath;
+ svn_pool_clear(iterpool);
tc_abspath = apr_hash_this_key(hi);