summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/FileUtil.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-12-14 22:51:50 +0100
committerJose <jose@zeroc.com>2016-12-14 22:51:50 +0100
commit64bc7eef5fc343c33acd6264ed26330de7d2e3a5 (patch)
tree17550e0b2e3d9356b6c934154fb57e174503f146 /cpp/src/IceUtil/FileUtil.cpp
parentWindows test script fixes (diff)
downloadice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.bz2
ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.xz
ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.zip
WinRT -> UWP renames
Diffstat (limited to 'cpp/src/IceUtil/FileUtil.cpp')
-rw-r--r--cpp/src/IceUtil/FileUtil.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index 9da2b9bd3c5..6c7203d7c87 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -17,7 +17,7 @@
#ifdef _WIN32
# include <process.h>
# include <io.h>
-# ifndef ICE_OS_WINRT
+# ifndef ICE_OS_UWP
# include <Shlwapi.h>
# endif
#else
@@ -96,7 +96,7 @@ IceUtilInternal::directoryExists(const string& path)
//
// Determine if a directory exists and is empty.
//
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
bool
IceUtilInternal::isEmptyDirectory(const string& path)
{
@@ -245,7 +245,7 @@ IceUtilInternal::open(const string& path, int flags)
}
}
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
int
IceUtilInternal::getcwd(string& cwd)
{
@@ -291,7 +291,7 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
// Don't need to use a wide string converter, the wide string is directly passed
// to Windows API.
//
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
_fd = ::CreateFileW(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
#else