You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2012/03/01 18:18:39 UTC
svn commit: r1295684 - in /apr/apr/branches/1.5.x: include/apr.hw
shmem/win32/shm.c
Author: trawick
Date: Thu Mar 1 17:18:39 2012
New Revision: 1295684
URL: http://svn.apache.org/viewvc?rev=1295684&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.
PR: 49155
Submitted by: <anindyabaruah gmail.com>
Modified:
apr/apr/branches/1.5.x/include/apr.hw
apr/apr/branches/1.5.x/shmem/win32/shm.c
Modified: apr/apr/branches/1.5.x/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr.hw?rev=1295684&r1=1295683&r2=1295684&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr.hw (original)
+++ apr/apr/branches/1.5.x/include/apr.hw Thu Mar 1 17:18:39 2012
@@ -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_uin
#define APR_DECLARE_DATA __declspec(dllimport)
#endif
-#ifdef WIN64
+#ifdef _WIN64
#define APR_SSIZE_T_FMT "I64d"
#define APR_SIZE_T_FMT "I64u"
#else
Modified: apr/apr/branches/1.5.x/shmem/win32/shm.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/shmem/win32/shm.c?rev=1295684&r1=1295683&r2=1295684&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/shmem/win32/shm.c (original)
+++ apr/apr/branches/1.5.x/shmem/win32/shm.c Thu Mar 1 17:18:39 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;