Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 36912 invoked from network); 11 Apr 2011 19:52:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Apr 2011 19:52:12 -0000 Received: (qmail 56687 invoked by uid 500); 11 Apr 2011 19:52:12 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 56605 invoked by uid 500); 11 Apr 2011 19:52:11 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 56598 invoked by uid 99); 11 Apr 2011 19:52:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2011 19:52:11 +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; Mon, 11 Apr 2011 19:52:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C014F23888CD; Mon, 11 Apr 2011 19:51:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1091182 - /apr/apr/branches/1.5.x/build/apr_hints.m4 Date: Mon, 11 Apr 2011 19:51:50 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110411195150.C014F23888CD@eris.apache.org> Author: trawick Date: Mon Apr 11 19:51:50 2011 New Revision: 1091182 URL: http://svn.apache.org/viewvc?rev=1091182&view=rev Log: grab a subset of trunk r1090664: enable APR_HAS_SENDFILE and APR_HAS_MMAP for MinGW builds (the rest of r1090664 was N/A, as the 1.x branches have different handling of included files in apr.hw/.h.in) Modified: apr/apr/branches/1.5.x/build/apr_hints.m4 Modified: apr/apr/branches/1.5.x/build/apr_hints.m4 URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/build/apr_hints.m4?rev=1091182&r1=1091181&r2=1091182&view=diff ============================================================================== --- apr/apr/branches/1.5.x/build/apr_hints.m4 (original) +++ apr/apr/branches/1.5.x/build/apr_hints.m4 Mon Apr 11 19:51:50 2011 @@ -456,16 +456,22 @@ dnl # Not a problem in 10.20. Ot APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes]) APR_SETIFNULL(ac_cv_file__dev_zero, [no]) APR_SETIFNULL(ac_cv_func_setpgrp_void, [no]) + APR_SETIFNULL(ac_cv_func_mmap, [yes]) case $host in *mingw32*) APR_SETIFNULL(apr_has_xthread_files, [1]) APR_SETIFNULL(apr_has_user, [1]) APR_SETIFNULL(apr_procattr_user_set_requires_password, [1]) + dnl The real function is TransmitFile(), not sendfile(), but + dnl this bypasses the Linux/Solaris/AIX/etc. test and enables + dnl the TransmitFile() implementation. + APR_SETIFNULL(ac_cv_func_sendfile, [yes]) ;; *mingwce) APR_SETIFNULL(apr_has_xthread_files, [0]) APR_SETIFNULL(apr_has_user, [0]) APR_SETIFNULL(apr_procattr_user_set_requires_password, [0]) + APR_SETIFNULL(ac_cv_func_sendfile, [no]) ;; esac ;;