From e990db00b0ac11e272fdd3335a59ecebcce6433d Mon Sep 17 00:00:00 2001 From: wrowe Date: Thu, 31 May 2007 23:55:21 +0000 Subject: The attached patch modifies include/arch/win32/apr_private.h so that on WinCE strtol is used instead of strtoi and that APR_INT64_STRFN is not defined. PR: 39884 Submitted by: Curt Arnold git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@543320 13f79535-47bb-0310-9956-ffa450edef68 --- include/arch/win32/apr_private.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/arch/win32/apr_private.h b/include/arch/win32/apr_private.h index 8bf9f38b1..e2738891b 100644 --- a/include/arch/win32/apr_private.h +++ b/include/arch/win32/apr_private.h @@ -143,7 +143,7 @@ APR_DECLARE_DATA int errno; #endif /* MSVC 7.0 introduced _strtoi64 */ -#if _MSC_VER >= 1300 && _INTEGRAL_MAX_BITS >= 64 +#if _MSC_VER >= 1300 && _INTEGRAL_MAX_BITS >= 64 && !defined(_WIN32_WCE) #define APR_INT64_STRFN _strtoi64 #endif @@ -154,8 +154,12 @@ APR_DECLARE_DATA int errno; #define APR_OFF_T_STRFN apr_strtoi64 #endif #else +#if defined(_WIN32_WCE) +#define APR_OFF_T_STRFN strtol +#else #define APR_OFF_T_STRFN strtoi #endif +#endif /* used to check for DWORD overflow in 64bit compiles */ #define APR_DWORD_MAX 0xFFFFFFFFUL -- cgit v1.2.1