svn commit: r1004349 - /subversion/trunk/subversion/libsvn_client/merge.c

[hwright]

Author: hwright
Date: Mon Oct  4 18:22:00 2010
New Revision: 1004349

URL: http://svn.apache.org/viewvc?rev=1004349&view=rev
Log:
Fix a potential compilation error when building with
SVN_MERGE__ALLOW_ALL_FORWARD_MERGES_FROM_SELF.

Found by: Philipp Kloke <philipp.kl...@web.de>

* subversion/libsvn_client/merge.c
  (filter_merged_revisions): Properly put brace outside of ifdef block.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1004349&r1=1004348&r2=1004349&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Oct  4 18:22:00 2010
@@ -3778,8 +3778,8 @@ filter_merged_revisions(svn_client__merg
             child->remaining_ranges = svn_rangelist_dup(explicit_rangelist,
                                                         pool);
         }
-    }
 #endif
+    }
 
   svn_pool_destroy(subpool);
   return SVN_NO_ERROR;