apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1295535 - in /apr/apr/trunk: include/apr.hw shmem/win32/shm.c
Date Thu, 01 Mar 2012 12:27:25 GMT
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: <anindyabaruah gmail.com>

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;



Mime
View raw message