From c648be7bef08894eb7dc99463eff1c03fc228a2d Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Thu, 12 Jun 2014 17:30:13 -0400
Subject: Windows deprecation fixes

---
 cpp/src/Ice/Service.cpp          | 11 -----------
 cpp/src/IceGrid/PlatformInfo.cpp |  2 +-
 cpp/src/IceUtil/FileUtil.cpp     |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index c775c1c6e5f..4fca9da3e36 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -7,7 +7,6 @@
 //
 // **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Thread.h>
@@ -788,17 +787,7 @@ Ice::Service::name() const
 bool
 Ice::Service::checkSystem() const
 {
-#ifdef _WIN32
-    //
-    // Check Windows version.
-    //
-    OSVERSIONINFO ver;
-    ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    GetVersionEx(&ver);
-    return (ver.dwPlatformId == VER_PLATFORM_WIN32_NT);
-#else
     return true;
-#endif
 }
 
 #ifdef _WIN32
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index 9cdb3aa073f..1efc51ee4d9 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.cpp
@@ -250,7 +250,7 @@ PlatformInfo::PlatformInfo(const string& prefix,
     osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 
 //
-// GetVerionEx deprecated in Windows 8.1
+// GetVersionEx deprecated in Windows 8.1
 //
 #  if defined(_MSC_VER) && _MSC_VER >= 1800
 #    pragma warning (disable : 4996)
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index 250abf105ea..9413d717fe9 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -237,7 +237,7 @@ IceUtilInternal::unlink(const string& path)
 int
 IceUtilInternal::close(int fd)
 {
-#ifdef __MINGW32__
+#ifdef _WIN32
         return _close(fd);
 #else
         return ::close(fd);
-- 
cgit v1.2.3