apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r652867 - in /apr/apr/branches/1.3.x/include: apr.h.in apr.hnw apr.hw arch/win32/apr_arch_misc.h
Date Fri, 02 May 2008 18:30:13 GMT
Author: wrowe
Date: Fri May  2 11:30:13 2008
New Revision: 652867

URL: http://svn.apache.org/viewvc?rev=652867&view=rev
Log:
Leverage the new apr_uintptr_t type for our ULONG_PTR members.

PR: 44327
Submitted by: Curt Arnold <carnold apache.org>
Backports: r652866

Modified:
    apr/apr/branches/1.3.x/include/apr.h.in
    apr/apr/branches/1.3.x/include/apr.hnw
    apr/apr/branches/1.3.x/include/apr.hw
    apr/apr/branches/1.3.x/include/arch/win32/apr_arch_misc.h

Modified: apr/apr/branches/1.3.x/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr.h.in?rev=652867&r1=652866&r2=652867&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr.h.in (original)
+++ apr/apr/branches/1.3.x/include/apr.h.in Fri May  2 11:30:13 2008
@@ -287,6 +287,12 @@
 
 #define APR_SIZEOF_VOIDP @voidp_size@
 
+#if APR_SIZEOF_VOIDP == 8
+typedef  apr_uint64_t            apr_uintptr_t;
+#else
+typedef  apr_uint32_t            apr_uintptr_t;
+#endif
+
 /* Are we big endian? */
 #define APR_IS_BIGENDIAN	@bigendian@
 

Modified: apr/apr/branches/1.3.x/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr.hnw?rev=652867&r1=652866&r2=652867&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr.hnw (original)
+++ apr/apr/branches/1.3.x/include/apr.hnw Fri May  2 11:30:13 2008
@@ -267,6 +267,12 @@
 #define APR_SIZEOF_VOIDP   4
 #endif
 
+#if APR_SIZEOF_VOIDP == 8
+typedef  apr_uint64_t            apr_uintptr_t;
+#else
+typedef  apr_uint32_t            apr_uintptr_t;
+#endif
+
 /* Mechanisms to properly type numeric literals */
 #define APR_INT64_C(val) (val##LL)
 #define APR_UINT64_C(val) (val##ULL)

Modified: apr/apr/branches/1.3.x/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr.hw?rev=652867&r1=652866&r2=652867&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr.hw (original)
+++ apr/apr/branches/1.3.x/include/apr.hw Fri May  2 11:30:13 2008
@@ -358,6 +358,13 @@
 #define APR_SIZEOF_VOIDP   4
 #endif
 
+#if APR_SIZEOF_VOIDP == 8
+typedef  apr_uint64_t            apr_uintptr_t;
+#else
+typedef  apr_uint32_t            apr_uintptr_t;
+#endif
+
+
 /* XXX These simply don't belong here, perhaps in apr_portable.h
  * based on some APR_HAVE_PID/GID/UID?
  */

Modified: apr/apr/branches/1.3.x/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/arch/win32/apr_arch_misc.h?rev=652867&r1=652866&r2=652867&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/branches/1.3.x/include/arch/win32/apr_arch_misc.h Fri May  2 11:30:13 2008
@@ -355,10 +355,10 @@
 typedef struct PBI {
     LONG      ExitStatus;
     PVOID     PebBaseAddress;
-    ULONG_PTR AffinityMask;
+    apr_uintptr_t AffinityMask;
     LONG      BasePriority;
-    ULONG_PTR UniqueProcessId;
-    ULONG_PTR InheritedFromUniqueProcessId;
+    apr_uintptr_t UniqueProcessId;
+    apr_uintptr_t InheritedFromUniqueProcessId;
 } PBI, *PPBI;
 
 APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, LONG, WINAPI, NtQueryInformationProcess, 0, (
@@ -384,7 +384,7 @@
     UINT Status;
     PVOID reserved;
     };
-    ULONG_PTR Information; /* Varies by op, consumed buffer size for FSI below */
+    apr_uintptr_t Information; /* Varies by op, consumed buffer size for FSI below */
 } IOSB, *PIOSB;
 
 typedef struct FSI {



Mime
View raw message