You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2008/05/02 20:29:49 UTC
svn commit: r652866 - in /apr/apr/trunk/include: apr.h.in apr.hnw apr.hw
arch/win32/apr_arch_misc.h
Author: wrowe
Date: Fri May 2 11:29:48 2008
New Revision: 652866
URL: http://svn.apache.org/viewvc?rev=652866&view=rev
Log:
Leverage the new apr_uintptr_t type for our ULONG_PTR members.
PR: 44327
Submitted by: Curt Arnold <carnold apache.org>
Modified:
apr/apr/trunk/include/apr.h.in
apr/apr/trunk/include/apr.hnw
apr/apr/trunk/include/apr.hw
apr/apr/trunk/include/arch/win32/apr_arch_misc.h
Modified: apr/apr/trunk/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.h.in?rev=652866&r1=652865&r2=652866&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.h.in (original)
+++ apr/apr/trunk/include/apr.h.in Fri May 2 11:29:48 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/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=652866&r1=652865&r2=652866&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Fri May 2 11:29:48 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/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=652866&r1=652865&r2=652866&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Fri May 2 11:29:48 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/trunk/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_misc.h?rev=652866&r1=652865&r2=652866&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Fri May 2 11:29:48 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 {