From ad088c09c2a5022eb12dbea4523242e05c5d7bdd Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Thu, 26 Jul 2012 17:13:54 +0200
Subject: MinGW & Ruby-1.9 updates

---
 cpp/src/IceUtil/InputUtil.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'cpp/src/IceUtil/InputUtil.cpp')

diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index 1b29658afbe..8f5edab81f9 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#if defined(_MSC_VER) && (_MSC_VER < 1300) 
+#if (defined(_MSC_VER) && (_MSC_VER < 1300) ) || (__MINGW32__)
 #include <limits.h>
 #endif
 
@@ -25,7 +25,9 @@ using namespace IceUtil;
 namespace IceUtilInternal
 {
 
-#if (defined(_MSC_VER) && (_MSC_VER < 1300))
+
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
+
 //
 // The VC60 runtime does not include _strtoi64, so we provide our own implementation
 //
@@ -177,7 +179,7 @@ Int64
 strToInt64(const char* s, char** endptr, int base)
 {
 #if defined(_WIN32)
-#   if (defined(_MSC_VER) && (_MSC_VER < 1300))
+#   if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
     return strToInt64Impl(s, endptr, base);
 #   else
     return _strtoi64(s, endptr, base);
-- 
cgit v1.2.3