diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-06 12:03:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-06 12:03:10 +0100 |
| commit | be4eff1d8b0b87f81be56d8cf166bcc209205638 (patch) | |
| tree | 437a4c3495753de1528653a82a5bd094193061e7 /drivers/windows | |
| parent | 20a33e809e5968f915021d162db955e207c8e7b7 (diff) | |
| parent | 411faaa6f478f837aa40893eaadf67e2b5d57cec (diff) | |
Merge pull request #7019 from vnen/rename-winrt-uwp
Rename WinRT platform to UWP
Diffstat (limited to 'drivers/windows')
| -rw-r--r-- | drivers/windows/dir_access_windows.cpp | 2 | ||||
| -rw-r--r-- | drivers/windows/file_access_windows.cpp | 4 | ||||
| -rw-r--r-- | drivers/windows/mutex_windows.cpp | 2 | ||||
| -rw-r--r-- | drivers/windows/semaphore_windows.cpp | 2 | ||||
| -rw-r--r-- | drivers/windows/shell_windows.cpp | 2 | ||||
| -rw-r--r-- | drivers/windows/thread_windows.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index ad4e8f301c..00d9afe51e 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -349,7 +349,7 @@ DirAccessWindows::DirAccessWindows() { drive_count=0; -#ifdef WINRT_ENABLED +#ifdef UWP_ENABLED Windows::Storage::StorageFolder ^install_folder = Windows::ApplicationModel::Package::Current->InstalledLocation; change_dir(install_folder->Path->Data()); diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp index 36dcab1d67..00e54e2b3e 100644 --- a/drivers/windows/file_access_windows.cpp +++ b/drivers/windows/file_access_windows.cpp @@ -125,8 +125,8 @@ void FileAccessWindows::close() { bool rename_error; -#ifdef WINRT_ENABLED - // WinRT has no PathFileExists, so we check attributes instead +#ifdef UWP_ENABLED + // UWP has no PathFileExists, so we check attributes instead DWORD fileAttr; fileAttr = GetFileAttributesW(save_path.c_str()); diff --git a/drivers/windows/mutex_windows.cpp b/drivers/windows/mutex_windows.cpp index f63415d0f8..f533626c30 100644 --- a/drivers/windows/mutex_windows.cpp +++ b/drivers/windows/mutex_windows.cpp @@ -81,7 +81,7 @@ MutexWindows::MutexWindows() { #ifdef WINDOWS_USE_MUTEX mutex = CreateMutex( NULL, FALSE, NULL ); #else - #ifdef WINRT_ENABLED + #ifdef UWP_ENABLED InitializeCriticalSectionEx( &mutex, 0, 0 ); #else InitializeCriticalSection( &mutex ); diff --git a/drivers/windows/semaphore_windows.cpp b/drivers/windows/semaphore_windows.cpp index 8d11d1b1c1..5ea98f341f 100644 --- a/drivers/windows/semaphore_windows.cpp +++ b/drivers/windows/semaphore_windows.cpp @@ -71,7 +71,7 @@ void SemaphoreWindows::make_default() { SemaphoreWindows::SemaphoreWindows() { -#ifdef WINRT_ENABLED +#ifdef UWP_ENABLED semaphore=CreateSemaphoreEx( NULL, 0, diff --git a/drivers/windows/shell_windows.cpp b/drivers/windows/shell_windows.cpp index c69d371a65..283a453be1 100644 --- a/drivers/windows/shell_windows.cpp +++ b/drivers/windows/shell_windows.cpp @@ -28,7 +28,7 @@ /*************************************************************************/ #ifdef WINDOWS_ENABLED -#ifdef WINRT_ENABLED +#ifdef UWP_ENABLED // Use Launcher class on windows 8 diff --git a/drivers/windows/thread_windows.cpp b/drivers/windows/thread_windows.cpp index 884575e81e..2056113412 100644 --- a/drivers/windows/thread_windows.cpp +++ b/drivers/windows/thread_windows.cpp @@ -28,7 +28,7 @@ /*************************************************************************/ #include "thread_windows.h" -#if defined(WINDOWS_ENABLED) && !defined(WINRT_ENABLED) +#if defined(WINDOWS_ENABLED) && !defined(UWP_ENABLED) #include "os/memory.h" |