apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r543321 - /apr/apr/branches/1.2.x/include/arch/win32/apr_private.h
Date Thu, 31 May 2007 23:55:40 GMT
Author: wrowe
Date: Thu May 31 16:55:40 2007
New Revision: 543321

URL: http://svn.apache.org/viewvc?view=rev&rev=543321
Log:
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 <carnold@apache.org>
Backport: 543320

Modified:
    apr/apr/branches/1.2.x/include/arch/win32/apr_private.h

Modified: apr/apr/branches/1.2.x/include/arch/win32/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/include/arch/win32/apr_private.h?view=diff&rev=543321&r1=543320&r2=543321
==============================================================================
--- apr/apr/branches/1.2.x/include/arch/win32/apr_private.h (original)
+++ apr/apr/branches/1.2.x/include/arch/win32/apr_private.h Thu May 31 16:55:40 2007
@@ -143,7 +143,7 @@
 #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,7 +154,11 @@
 #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 */



Mime
View raw message