summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_NS_stdlib.inl
diff options
context:
space:
mode:
authorvzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-05-30 13:40:21 +0000
committervzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-05-30 13:40:21 +0000
commitf6919836a5d854dc9769299868084a58f6e9e708 (patch)
treeee281c51ca23fa339c74246107d83360f784a3cc /ACE/ace/OS_NS_stdlib.inl
parent5e87364064bacb5e4037e009c3a00de5eed13c03 (diff)
downloadATCD-f6919836a5d854dc9769299868084a58f6e9e708.tar.gz
ChangeLogTag: Fri May 30 13:37:13 UTC 2008 Vladimir Zykov <vzykov@prismtech.com>
Diffstat (limited to 'ACE/ace/OS_NS_stdlib.inl')
-rw-r--r--ACE/ace/OS_NS_stdlib.inl4
1 files changed, 2 insertions, 2 deletions
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);