You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/09/08 11:59:22 UTC
svn commit: r994957 - in /subversion/trunk/subversion:
include/private/svn_dep_compat.h libsvn_repos/reporter.c
Author: philip
Date: Wed Sep 8 09:59:22 2010
New Revision: 994957
URL: http://svn.apache.org/viewvc?rev=994957&view=rev
Log:
Followup to r993425, compatibility with older APR.
* subversion/include/private/svn_dep_compat.h
(APR_SIZE_MAX): Define for older APR.
* subversion/libsvn_repos/reporter.c: Remove APR_SIZE_MAX definition,
include svn_dep_compat.h
Modified:
subversion/trunk/subversion/include/private/svn_dep_compat.h
subversion/trunk/subversion/libsvn_repos/reporter.c
Modified: subversion/trunk/subversion/include/private/svn_dep_compat.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_dep_compat.h?rev=994957&r1=994956&r2=994957&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/trunk/subversion/include/private/svn_dep_compat.h Wed Sep 8 09:59:22 2010
@@ -69,6 +69,7 @@ extern "C" {
#define APR_UINT64_MAX APR_UINT64_C(0xFFFFFFFFFFFFFFFF)
#define APR_INT64_MAX APR_INT64_C(0x7FFFFFFFFFFFFFFF)
#define APR_INT64_MIN (-APR_INT64_MAX-1)
+#define APR_SIZE_MAX (~(apr_size_t)0)
#endif
/**
Modified: subversion/trunk/subversion/libsvn_repos/reporter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/reporter.c?rev=994957&r1=994956&r2=994957&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/reporter.c (original)
+++ subversion/trunk/subversion/libsvn_repos/reporter.c Wed Sep 8 09:59:22 2010
@@ -32,6 +32,7 @@
#include "svn_props.h"
#include "repos.h"
#include "svn_private_config.h"
+#include "private/svn_dep_compat.h"
#define NUM_CACHED_SOURCE_ROOTS 4
@@ -155,11 +156,6 @@ read_number(apr_uint64_t *num, apr_file_
return SVN_NO_ERROR;
}
-#ifndef APR_SIZE_MAX
-/* APR 0.9 doesn't define APR_SIZE_MAX */
-#define APR_SIZE_MAX (~((apr_size_t)0))
-#endif
-
static svn_error_t *
read_string(const char **str, apr_file_t *temp, apr_pool_t *pool)
{