diff options
| author | Jeff Trawick <trawick@apache.org> | 2012-03-01 17:18:39 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2012-03-01 17:18:39 +0000 |
| commit | 5155e071b89128c421ca4ab5a6231d5191cdbc1b (patch) | |
| tree | 3a4dd2593dbb1ff38617045ab057910c56cc7758 /shmem | |
| parent | ab5ccb24d4646d0d2e2331c8f9a68062528ad00f (diff) | |
| download | apr-5155e071b89128c421ca4ab5a6231d5191cdbc1b.tar.gz | |
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: <anindyabaruah gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1295684 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
| -rw-r--r-- | shmem/win32/shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |