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 A33BF90C9 for ; Thu, 1 Mar 2012 12:27:47 +0000 (UTC) Received: (qmail 57603 invoked by uid 500); 1 Mar 2012 12:27:47 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 57520 invoked by uid 500); 1 Mar 2012 12:27:46 -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 57509 invoked by uid 99); 1 Mar 2012 12:27:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2012 12:27:46 +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 12:27:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A108723889DA for ; Thu, 1 Mar 2012 12:27:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1295535 - in /apr/apr/trunk: include/apr.hw shmem/win32/shm.c Date: Thu, 01 Mar 2012 12:27:25 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120301122725.A108723889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Thu Mar 1 12:27:25 2012 New Revision: 1295535 URL: http://svn.apache.org/viewvc?rev=1295535&view=rev Log: Use _WIN64 instead of WIN64 (compiler define vs. SDK define) in .c/.h. WIN64 wasn't defined, resulting in crashes in httpd. Submitted by: Modified: apr/apr/trunk/include/apr.hw apr/apr/trunk/shmem/win32/shm.c Modified: apr/apr/trunk/include/apr.hw URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=1295535&r1=1295534&r2=1295535&view=diff ============================================================================== --- apr/apr/trunk/include/apr.hw (original) +++ apr/apr/trunk/include/apr.hw Thu Mar 1 12:27:25 2012 @@ -385,7 +385,7 @@ typedef long apr_off_t; typedef int apr_socklen_t; typedef apr_uint64_t apr_ino_t; -#ifdef WIN64 +#ifdef _WIN64 #define APR_SIZEOF_VOIDP 8 #else #define APR_SIZEOF_VOIDP 4 @@ -586,7 +586,7 @@ typedef apr_uint32_t apr_uin * if ssize_t is a long int we define it to be "ld", * if ssize_t is 64-bit, we define it to be msvc specific "I64d" */ -#ifdef WIN64 +#ifdef _WIN64 #define APR_SSIZE_T_FMT "I64d" #define APR_SIZE_T_FMT "I64u" #else Modified: apr/apr/trunk/shmem/win32/shm.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/shmem/win32/shm.c?rev=1295535&r1=1295534&r2=1295535&view=diff ============================================================================== --- apr/apr/trunk/shmem/win32/shm.c (original) +++ apr/apr/trunk/shmem/win32/shm.c Thu Mar 1 12:27:25 2012 @@ -82,7 +82,7 @@ APR_DECLARE(apr_status_t) apr_shm_create /* Compute the granualar multiple of the pagesize */ size = memblock * (1 + (reqsize - 1) / memblock); sizelo = (DWORD)size; -#ifdef WIN64 +#ifdef _WIN64 sizehi = (DWORD)(size >> 32); #else sizehi = 0;