From f6919836a5d854dc9769299868084a58f6e9e708 Mon Sep 17 00:00:00 2001 From: vzykov Date: Fri, 30 May 2008 13:40:21 +0000 Subject: ChangeLogTag: Fri May 30 13:37:13 UTC 2008 Vladimir Zykov --- ACE/ace/OS_NS_stdlib.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ACE/ace/OS_NS_stdlib.inl') diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 3ed7b606869..0f94d86da1b 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -464,7 +464,7 @@ ACE_OS::strtoull (const char *s, char **ptr, int base) { #if defined (ACE_LACKS_STRTOULL) return ACE_OS::strtoull_emulation (s, ptr, base); -#elif defined (ACE_WIN32) +#elif defined (ACE_WIN32) && !defined (__MINGW32__) return ::_strtoui64 (s, ptr, base); #else return ::strtoull (s, ptr, base); @@ -475,7 +475,7 @@ ACE_OS::strtoull (const char *s, char **ptr, int base) ACE_INLINE ACE_UINT64 ACE_OS::strtoull (const wchar_t *s, wchar_t **ptr, int base) { -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && !defined (__MINGW32__) return ::_wcstoui64 (s, ptr, base); #else return ACE_WCHAR_STD_NAMESPACE::wcstoull (s, ptr, base); -- cgit v1.2.1