Author: hwright
Date: Mon Oct 25 18:03:49 2010
New Revision: 1027213
URL: http://svn.apache.org/viewvc?rev=1027213&view=rev
Log:
Merge r985482 from the performance branch.
This revision just suggests inlining of a couple of static functions.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/libsvn_subr/io.c
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 25 18:03:49 2010
@@ -23,7 +23,7 @@
/subversion/branches/log-g-performance:870941-871032
/subversion/branches/merge-skips-obstructions:874525-874615
/subversion/branches/nfc-nfd-aware-client:870276,870376
-/subversion/branches/performance:982355,983764,983766,984927,985014,985037,985046,985472,985477,985500,985669,987888,987893,995507,995603,1001413,1025660
+/subversion/branches/performance:982355,983764,983766,984927,985014,985037,985046,985472,985477,985482,985500,985669,987888,987893,995507,995603,1001413,1025660
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
/subversion/branches/subtree-mergeinfo:876734-878766
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1027213&r1=1027212&r2=1027213&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Mon Oct 25 18:03:49 2010
@@ -1721,7 +1721,7 @@ svn_io_file_lock2(const char *lock_file,
/* Data consistency/coherency operations. */
-static svn_error_t *
+static APR_INLINE svn_error_t *
do_io_file_wrapper_cleanup(apr_file_t *file, apr_status_t status,
const char *msg, const char *msg_no_name,
apr_pool_t *pool);
@@ -2782,7 +2782,7 @@ svn_io_file_open(apr_file_t **new_file,
}
-static svn_error_t *
+static APR_INLINE svn_error_t *
do_io_file_wrapper_cleanup(apr_file_t *file, apr_status_t status,
const char *msg, const char *msg_no_name,
apr_pool_t *pool)
