summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog9
-rw-r--r--ACE/ace/OS_NS_stdlib.inl4
-rw-r--r--ACE/ace/config-cygwin32.h2
3 files changed, 13 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6c3e8a71cc1..4aaa1ba7452 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,12 @@
+Fri May 30 13:37:13 UTC 2008 Vladimir Zykov <vzykov@prismtech.com>
+
+ * ace/OS_NS_stdlib.inl:
+ Fixed MinGW builds.
+
+ * ace/config-cygwin32.h:
+ Disabled wcstoull() on cygwin since it doesn't provide
+ such function.
+
Fri May 30 13:17:55 UTC 2008 Simon Massey <sma@prismtech.com>
* test/INET_Addr_Test_IPV6.cpp:
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);
diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h
index 99b709e4c49..adfb4b1a03c 100644
--- a/ACE/ace/config-cygwin32.h
+++ b/ACE/ace/config-cygwin32.h
@@ -144,6 +144,8 @@
#define ACE_LACKS_FGETWS 1
#define ACE_LACKS_FPUTWS 1
+#define ACE_LACKS_WCSTOULL 1
+
#define ACE_HAS_AUTOMATIC_INIT_FINI
#define ACE_HAS_SIGWAIT