[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1349661 - /subversion/trunk/subversion/libsvn_subr/cache-memcache.c

From: Hyrum K Wright <hyrum.wright_at_wandisco.com>
Date: Wed, 13 Jun 2012 09:58:17 +0200

On Wed, Jun 13, 2012 at 9:22 AM, <gstein_at_apache.org> wrote:
> Author: gstein
> Date: Wed Jun 13 07:22:00 2012
> New Revision: 1349661
>
> URL: http://svn.apache.org/viewvc?rev=1349661&view=rev
> Log:
> Followup to r1349277: old APRs do not have APR_INT16_MAX
>
> * subversion/libsvn_subr/cache-memcache.c:
>  (...): define APR_INT16_MAX if it is undefined
>
> Modified:
>    subversion/trunk/subversion/libsvn_subr/cache-memcache.c
>
> Modified: subversion/trunk/subversion/libsvn_subr/cache-memcache.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-memcache.c?rev=1349661&r1=1349660&r2=1349661&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_subr/cache-memcache.c (original)
> +++ subversion/trunk/subversion/libsvn_subr/cache-memcache.c Wed Jun 13 07:22:00 2012
> @@ -36,6 +36,11 @@
>
>  #include <apr_memcache.h>
>
> +/* Older APRs do not have this.  */
> +#ifndef APR_INT16_MAX
> +#define APR_INT16_MAX   (0x7fff)
> +#endif
> +

Instead defining this macro here, just include
private/svn_dep_compat.h, which conditionally defines this macro if
the APR version isn't high enough.

-Hyrum

>  /* A note on thread safety:
>
>    The apr_memcache_t object does its own mutex handling, and nothing
>
>

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Received on 2012-06-13 09:58:53 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.