Index: subversion/libsvn_subr/cache-membuffer.c =================================================================== --- subversion/libsvn_subr/cache-membuffer.c (revision 1180755) +++ subversion/libsvn_subr/cache-membuffer.c (working copy) @@ -116,7 +116,7 @@ /* Don't create cache segments smaller than this value unless the total * cache size itself is smaller. */ -#define MIN_SEGMENT_SIZE 0x2000000ull +#define MIN_SEGMENT_SIZE 0x2000000ui64 /* We don't mark the initialization status for every group but initialize * a number of groups at once. That will allow for a very small init flags Index: subversion/libsvn_subr/cache.c =================================================================== --- subversion/libsvn_subr/cache.c (revision 1180755) +++ subversion/libsvn_subr/cache.c (working copy) @@ -211,15 +211,15 @@ { enum { _1MB = 1024 * 1024 }; - apr_uint64_t misses = info->gets - info->hits; - double hit_rate = (100.0 * info->hits) - / (info->gets ? info->gets : 1); - double write_rate = (100.0 * info->sets) + apr_int64_t misses = info->gets - info->hits; + double hit_rate = (100.0 * (apr_int64_t)info->hits) + / (info->gets ? (apr_int64_t)info->gets : 1); + double write_rate = (100.0 * (apr_int64_t)info->sets) / (misses ? misses : 1); - double data_usage_rate = (100.0 * info->used_size) - / (info->data_size ? info->data_size : 1); - double data_entry_rate = (100.0 * info->used_entries) - / (info->total_entries ? info->total_entries : 1); + double data_usage_rate = (100.0 * (apr_int64_t)info->used_size) + / (info->data_size ? (apr_int64_t)info->data_size : 1); + double data_entry_rate = (100.0 * (apr_int64_t)info->used_entries) + / (info->total_entries ? (apr_int64_t)info->total_entries : 1); return svn_string_createf(result_pool, Index: subversion/include/svn_types.h =================================================================== --- subversion/include/svn_types.h (revision 1180755) +++ subversion/include/svn_types.h (working copy) @@ -29,6 +29,7 @@ /* ### this should go away, but it causes too much breakage right now */ #include +#include /* for ULONG_MAX */ #include /* for apr_size_t, apr_int64_t, ... */ #include /* for apr_status_t */