Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D39E79609 for ; Thu, 1 Mar 2012 17:20:07 +0000 (UTC) Received: (qmail 99072 invoked by uid 500); 1 Mar 2012 17:20:07 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 99034 invoked by uid 500); 1 Mar 2012 17:20:07 -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 99026 invoked by uid 99); 1 Mar 2012 17:20:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2012 17:20:07 +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, 01 Mar 2012 17:20:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C80C42388860 for ; Thu, 1 Mar 2012 17:19:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1295684 - svn:log Date: Thu, 01 Mar 2012 17:19:44 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120301171944.C80C42388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Revision: 1295684 Modified property: svn:log Modified: svn:log at Thu Mar 1 17:19:44 2012 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Thu Mar 1 17:19:44 2012 @@ -1,3 +1,5 @@ +Merge r1295535 from trunk: + Use _WIN64 instead of WIN64 (compiler define vs. SDK define) in .c/.h. WIN64 wasn't defined, resulting in crashes in httpd.