From 66d8438c3c3128f991f08bca2433ef615fe488b6 Mon Sep 17 00:00:00 2001 From: trawick Date: Thu, 1 Mar 2012 17:18:39 +0000 Subject: 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. PR: 49155 Submitted by: git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1295684 13f79535-47bb-0310-9956-ffa450edef68 --- shmem/win32/shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shmem') diff --git a/shmem/win32/shm.c b/shmem/win32/shm.c index da736aa62..85926ab7e 100644 --- a/shmem/win32/shm.c +++ b/shmem/win32/shm.c @@ -82,7 +82,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, /* 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; -- cgit v1.2.1