diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2012-03-01 17:18:39 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2012-03-01 17:18:39 +0000 |
| commit | 66d8438c3c3128f991f08bca2433ef615fe488b6 (patch) | |
| tree | 3a4dd2593dbb1ff38617045ab057910c56cc7758 | |
| parent | 0df817ce2fc801a334fc7e3d382b7a62df07a392 (diff) | |
| download | libapr-66d8438c3c3128f991f08bca2433ef615fe488b6.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: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1295684 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/apr.hw | 4 | ||||
| -rw-r--r-- | shmem/win32/shm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/apr.hw b/include/apr.hw index 0aaa62c63..0307bdf0e 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -377,7 +377,7 @@ typedef int 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 @@ -552,7 +552,7 @@ typedef apr_uint32_t apr_uintptr_t; #define APR_DECLARE_DATA __declspec(dllimport) #endif -#ifdef WIN64 +#ifdef _WIN64 #define APR_SSIZE_T_FMT "I64d" #define APR_SIZE_T_FMT "I64u" #else 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; |