Author: philip
Date: Tue Sep 7 08:47:11 2010
New Revision: 993281
URL: http://svn.apache.org/viewvc?rev=993281&view=rev
Log:
Followup to r993183, compatibility with older APR.
* subversion/include/private/svn_dep_compat.h
(APR_UINT32_MAX, APR_INT32_MAX, APR_INT32_MIN,
APR_UINT64_MAX, APR_INT64_MAX, APR_INT64_MIN): Define for older APR.
* subversion/libsvn_subr/svn_string.c: Include svn_dep_compat.h.
Modified:
subversion/trunk/subversion/include/private/svn_dep_compat.h
subversion/trunk/subversion/libsvn_subr/svn_string.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=993281&r1=993280&r2=993281&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/trunk/subversion/include/private/svn_dep_compat.h Tue Sep 7
08:47:11 2010
@@ -62,6 +62,15 @@ extern "C" {
#define apr_array_clear(arr) (arr)->nelts = 0
#endif
+#if !APR_VERSION_AT_LEAST(1,3,0)
+#define APR_UINT32_MAX 0xFFFFFFFFU
+#define APR_INT32_MAX 0x7FFFFFFF
+#define APR_INT32_MIN (-APR_INT32_MAX-1)
+#define APR_UINT64_MAX APR_UINT64_C(0xFFFFFFFFFFFFFFFF)
+#define APR_INT64_MAX APR_INT64_C(0x7FFFFFFFFFFFFFFF)
+#define APR_INT64_MIN (-APR_INT64_MAX-1)
+#endif
+
/**
* Check at compile time if the Serf version is at least a certain
* level.
Modified: subversion/trunk/subversion/libsvn_subr/svn_string.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/svn_string.c?rev=993281&r1=993280&r2=993281&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/svn_string.c (original)
+++ subversion/trunk/subversion/libsvn_subr/svn_string.c Tue Sep 7 08:47:11
2010
@@ -32,6 +32,7 @@
#include <apr_fnmatch.h>
#include "svn_string.h" /* loads "svn_types.h" and <apr_pools.h> */
#include "svn_ctype.h"
+#include "private/svn_dep_compat.h"
#include "svn_private_config.h"
