Author: stefan2
Date: Tue Feb 17 10:12:51 2015
New Revision: 1660341
URL: http://svn.apache.org/r1660341
Log:
On the 1.8.x-r1590751 branch: Fix build.
* subversion/svn/svn.c
(sub_main): There is no SVN_ERR compatible sub_main in 1.8.x.
Use the correct error check macro.
Modified:
subversion/branches/1.8.x-r1659867/subversion/svn/svn.c
Modified: subversion/branches/1.8.x-r1659867/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1659867/subversion/svn/svn.c?rev=1660341&r1=1660340&r2=1660341&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1659867/subversion/svn/svn.c (original)
+++ subversion/branches/1.8.x-r1659867/subversion/svn/svn.c Tue Feb 17 10:12:51
2015
@@ -2519,9 +2519,9 @@ sub_main(int argc, const char *argv[], a
svn_handle_warning2(stderr, err, "svn: ");
svn_error_clear(err);
cfg_hash = apr_hash_make(pool);
- SVN_ERR(svn_config_create2(&empty_cfg, FALSE, FALSE, pool));
+ SVN_INT_ERR(svn_config_create2(&empty_cfg, FALSE, FALSE, pool));
svn_hash_sets(cfg_hash, SVN_CONFIG_CATEGORY_CONFIG, empty_cfg);
- SVN_ERR(svn_config_create2(&empty_cfg, FALSE, FALSE, pool));
+ SVN_INT_ERR(svn_config_create2(&empty_cfg, FALSE, FALSE, pool));
svn_hash_sets(cfg_hash, SVN_CONFIG_CATEGORY_SERVERS, empty_cfg);
}
else
