Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 9575 invoked from network); 3 Mar 2011 22:28:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Mar 2011 22:28:23 -0000 Received: (qmail 26587 invoked by uid 500); 3 Mar 2011 22:28:23 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 26568 invoked by uid 500); 3 Mar 2011 22:28:23 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 26561 invoked by uid 99); 3 Mar 2011 22:28:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 22:28:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 22:28:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 50BDC23888E4; Thu, 3 Mar 2011 22:28:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076846 - /subversion/trunk/subversion/include/private/svn_dep_compat.h Date: Thu, 03 Mar 2011 22:28:02 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110303222802.50BDC23888E4@eris.apache.org> Author: stefan2 Date: Thu Mar 3 22:28:02 2011 New Revision: 1076846 URL: http://svn.apache.org/viewvc?rev=1076846&view=rev Log: Fix build with pre-1.3.0 APR broken by with 1076556. * subversion/include/private/svn_dep_compat.h (apr_uintptr_t): ensure that this is declared even with pre-1.3.0 APR Modified: subversion/trunk/subversion/include/private/svn_dep_compat.h 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=1076846&r1=1076845&r2=1076846&view=diff ============================================================================== --- subversion/trunk/subversion/include/private/svn_dep_compat.h (original) +++ subversion/trunk/subversion/include/private/svn_dep_compat.h Thu Mar 3 22:28:02 2011 @@ -73,7 +73,13 @@ extern "C" { #define APR_INT64_MAX APR_INT64_C(0x7FFFFFFFFFFFFFFF) #define APR_INT64_MIN (-APR_INT64_MAX-1) #define APR_SIZE_MAX (~(apr_size_t)0) + +#if APR_SIZEOF_VOIDP == 8 +typedef apr_uint64_t apr_uintptr_t; +#else +typedef apr_uint32_t apr_uintptr_t; #endif +#endif /* !APR_VERSION_AT_LEAST(1,3,0) */ /** * Check at compile time if the Serf version is at least a certain