apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1295686 - in /apr/apr/branches/1.4.x: CHANGES include/apr.hw shmem/win32/shm.c
Date Thu, 01 Mar 2012 17:26:08 GMT
Author: trawick
Date: Thu Mar  1 17:26:07 2012
New Revision: 1295686

URL: http://svn.apache.org/viewvc?rev=1295686&view=rev
Log:
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>

Modified:
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/include/apr.hw
    apr/apr/branches/1.4.x/shmem/win32/shm.c

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=1295686&r1=1295685&r2=1295686&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Thu Mar  1 17:26:07 2012
@@ -1,7 +1,8 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.4.7
 
-
+  *) Windows: Fix compile-time checks for 64-bit builds, resolving a
+     crash in httpd's mod_rewrite.  PR 49155.  [<anindyabaruah gmail.com>]
 
 Changes for APR 1.4.6
 

Modified: apr/apr/branches/1.4.x/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr.hw?rev=1295686&r1=1295685&r2=1295686&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr.hw (original)
+++ apr/apr/branches/1.4.x/include/apr.hw Thu Mar  1 17:26:07 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.4.x/shmem/win32/shm.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/shmem/win32/shm.c?rev=1295686&r1=1295685&r2=1295686&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/shmem/win32/shm.c (original)
+++ apr/apr/branches/1.4.x/shmem/win32/shm.c Thu Mar  1 17:26:07 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