diff options
Diffstat (limited to 'subversion/include/private')
| -rw-r--r-- | subversion/include/private/svn_cache.h | 8 | ||||
| -rw-r--r-- | subversion/include/private/svn_dep_compat.h | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/subversion/include/private/svn_cache.h b/subversion/include/private/svn_cache.h index df40f7e0691fc..08d2f09cb6147 100644 --- a/subversion/include/private/svn_cache.h +++ b/subversion/include/private/svn_cache.h @@ -182,6 +182,10 @@ typedef struct svn_cache__info_t * if they are strings. Cached values will be copied in and out of * the cache using @a serialize_func and @a deserialize_func, respectively. * + * If @a deserialize_func is NULL, then the data is returned as an + * svn_stringbuf_t; if @a serialize_func is NULL, then the data is + * assumed to be an svn_stringbuf_t. + * * The cache stores up to @a pages * @a items_per_page items at a * time. The exact cache invalidation strategy is not defined here, * but in general, a lower value for @a items_per_page means more @@ -224,7 +228,7 @@ svn_cache__create_inprocess(svn_cache__t **cache_p, * other caches. @a *cache_p will be allocated in @a result_pool. * * If @a deserialize_func is NULL, then the data is returned as an - * svn_string_t; if @a serialize_func is NULL, then the data is + * svn_stringbuf_t; if @a serialize_func is NULL, then the data is * assumed to be an svn_stringbuf_t. * * These caches are always thread safe. @@ -309,7 +313,7 @@ svn_cache__membuffer_cache_create(svn_membuffer_t **cache, * this cache from other caches. @a *cache_p will be allocated in @a result_pool. * * If @a deserialize_func is NULL, then the data is returned as an - * svn_string_t; if @a serialize_func is NULL, then the data is + * svn_stringbuf_t; if @a serialize_func is NULL, then the data is * assumed to be an svn_stringbuf_t. * * If @a thread_safe is true, and APR is compiled with threads, all diff --git a/subversion/include/private/svn_dep_compat.h b/subversion/include/private/svn_dep_compat.h index 71c0b9a754931..108b67cd673ee 100644 --- a/subversion/include/private/svn_dep_compat.h +++ b/subversion/include/private/svn_dep_compat.h @@ -78,6 +78,7 @@ void svn_hash__clear(struct apr_hash_t *ht); #if !APR_VERSION_AT_LEAST(1,0,0) #define APR_UINT64_C(val) UINT64_C(val) #define APR_FPROT_OS_DEFAULT APR_OS_DEFAULT +#define apr_hash_make_custom(pool,hash_func) apr_hash_make(pool) #endif #if !APR_VERSION_AT_LEAST(1,3,0) @@ -114,6 +115,12 @@ typedef apr_uint32_t apr_uintptr_t; #define SVN_LOCK_IS_BUSY(x) APR_STATUS_IS_EBUSY(x) #endif +#if !APR_VERSION_AT_LEAST(1,4,0) +#ifndef apr_time_from_msec +#define apr_time_from_msec(msec) ((apr_time_t)(msec) * 1000) +#endif +#endif + /** * Check at compile time if the Serf version is at least a certain * level. |