WinRT -> UWP renames

11 files changed, 22 insertions, 22 deletions

diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index c5acf6bd16e..70143b7a8e2 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -16,7 +16,7 @@
 #include <Glacier2/Session.h>
 #include <Glacier2/PermissionsVerifier.h>
 #include <Glacier2/Metrics.h>
-#if (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) && !defined(ICE_OS_WINRT)
+#if (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) && !defined(ICE_OS_UWP)
 #   include <Glacier2/Application.h>
 #endif
 #include <Glacier2/SessionHelper.h>
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index c6672061f1d..eec473a0ddb 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -22,7 +22,7 @@
 #include <vector>
 #include <map>
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 #   if defined(_WIN32)
 #      include <process.h>
 #   else
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index c5788002ec5..9a26eb96a3b 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -32,7 +32,7 @@
 #include <Ice/OutgoingAsync.h>
 #include <Ice/IncomingAsync.h>
 #include <Ice/Process.h>
-#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
 #   include <Ice/Application.h>
 #endif
 #include <Ice/Connection.h>
@@ -47,7 +47,7 @@
 #include <Ice/Instrumentation.h>
 #include <Ice/Metrics.h>
 #include <Ice/SliceChecksums.h>
-#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
 #   include <Ice/Service.h>
 #endif
 #include <Ice/RegisterPlugins.h>
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index 8e7cc50b1e6..4cbbead9c1e 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/Config.h
@@ -31,7 +31,7 @@
 #  define ICE_USE_SECURE_TRANSPORT_MACOS 1
 #endif
 #elif defined(_WIN32)
-#  if !defined(ICE_OS_WINRT)
+#  if !defined(ICE_OS_UWP)
 #    define ICE_USE_SCHANNEL 1
 #  endif
 #else
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 8dd6fa24d8b..82143cb4ac9 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -25,7 +25,7 @@
 
 // For struct sockaddr_storage
 #ifdef _WIN32
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 #   include <winsock2.h>
 #endif
 #else
@@ -72,7 +72,7 @@ typedef SecKeyRef KeyRef;
 typedef CERT_SIGNED_CONTENT_INFO* X509CertificateRef;
 typedef CERT_PUBLIC_KEY_INFO* KeyRef;
 
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
 
 typedef Windows::Security::Cryptography::Certificates::Certificate^ X509CertificateRef;
 typedef Windows::Security::Cryptography::Core::CryptographicKey^ KeyRef;
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 94c31eeff25..0b8173e2b0b 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -142,11 +142,11 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1900)
 
 //
-// Check if building for WinRT
+// Check if building for UWP
 //
 #   include <winapifamily.h>
 #   if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-#      define ICE_OS_WINRT
+#      define ICE_OS_UWP
 #      define ICE_STATIC_LIBS
 #   endif
 
@@ -278,13 +278,13 @@
 
 #   ifdef ICE_CPP11_MAPPING
 #      if defined(_DEBUG)
-#         if defined(ICE_OS_WINRT)
+#         if defined(ICE_OS_UWP)
 #            define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11D.lib"
 #         else
 #            define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D.lib"
 #         endif
 #      else
-#         if defined(ICE_OS_WINRT)
+#         if defined(ICE_OS_UWP)
 #            define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11.lib"
 #         else
 #            define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11.lib"
@@ -292,13 +292,13 @@
 #      endif
 #   else
 #      if defined(_DEBUG)
-#         if defined(ICE_OS_WINRT)
+#         if defined(ICE_OS_UWP)
 #            define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwpD.lib"
 #         else
 #            define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D.lib"
 #         endif
 #      else
-#         if defined(ICE_OS_WINRT)
+#         if defined(ICE_OS_UWP)
 #            define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp.lib"
 #         else
 #            define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION ".lib"
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index d943aa3f9df..86a57adb7a5 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -90,7 +90,7 @@ ICE_API FILE* fopen(const std::string&, const std::string&);
 ICE_API FILE* freopen(const std::string&, const std::string&, FILE*);
 ICE_API int open(const std::string&, int);
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 ICE_API int getcwd(std::string&);
 #endif
 
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 1f9f4b56313..b338dcc2e4f 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -19,7 +19,7 @@
 
 #include <IceUtil/Config.h>
 #include <IceUtil/Cond.h>
-#if !defined(__APPLE__) && !defined(ICE_OS_WINRT)
+#if !defined(__APPLE__) && !defined(ICE_OS_UWP)
 #   include <IceUtil/CtrlCHandler.h>
 #endif
 #include <IceUtil/Exception.h>
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index 9b88540bcee..5e8d04bef94 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -141,7 +141,7 @@ Mutex::Mutex(MutexProtocol protocol)
 inline void
 Mutex::init(MutexProtocol)
 {
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
     InitializeCriticalSectionEx(&_mutex, 0, 0);
 #else
     InitializeCriticalSection(&_mutex);
diff --git a/cpp/include/IceUtil/SHA1.h b/cpp/include/IceUtil/SHA1.h
index 32b64406870..d3ec7e48499 100644
--- a/cpp/include/IceUtil/SHA1.h
+++ b/cpp/include/IceUtil/SHA1.h
@@ -21,7 +21,7 @@ namespace IceUtilInternal
 ICE_API void 
 sha1(const unsigned char*, std::size_t, std::vector<unsigned char>&);
     
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 class ICE_API SHA1
 {
 public:
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index f1dd851aa84..2431038a53e 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -15,7 +15,7 @@
 #include <IceUtil/Handle.h>
 #include <IceUtil/Mutex.h>
 
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
 #   include <memory>
 #   include <thread>
 #endif
@@ -35,7 +35,7 @@ public:
     //
     ThreadControl();
 
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
     ThreadControl(const std::shared_ptr<std::thread>&);
 #elif defined(_WIN32)
     ThreadControl(HANDLE, DWORD);
@@ -80,7 +80,7 @@ public:
     // id() returns the Thread ID on Windows and the underlying pthread_t
     // on POSIX platforms.
     //
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
     typedef std::thread::id ID;
 #elif defined(_WIN32)
     typedef DWORD ID;
@@ -94,7 +94,7 @@ public:
 
 private:
 
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
     std::shared_ptr<std::thread> _thread;
     std::thread::id _id;
 #elif defined(_WIN32)
@@ -152,7 +152,7 @@ protected:
     bool _started;
     bool _running;
 
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
     std::shared_ptr<std::thread> _thread;
 #elif defined(_WIN32)
     HANDLE _handle;