WIN32 macro -> _WIN32

src/frontend-common/common_host_interface.cpp

@@ -51,7 +51,7 @@
 #include "cheevos.h"
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "common/windows_headers.h"
 #include <KnownFolders.h>
 #include <ShlObj.h>
@@ -926,7 +926,7 @@ void CommonHostInterface::SetUserDirectory()
   }
   else
   {
-#if defined(WIN32)
+#if defined(_WIN32)
     // On Windows, use My Documents\DuckStation.
     PWSTR documents_directory;
     if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &documents_directory)))
@@ -3092,7 +3092,7 @@ void CommonHostInterface::SetTimerResolutionIncreased(bool enabled)
 
   m_timer_resolution_increased = enabled;
 
-#ifdef WIN32
+#ifdef _WIN32
   if (enabled)
     timeBeginPeriod(1);
   else

src/frontend-common/controller_interface.cpp

@@ -109,7 +109,7 @@ static constexpr std::array<const char*, static_cast<u32>(ControllerInterface::B
 #ifdef WITH_SDL2
   TRANSLATABLE("ControllerInterface", "SDL"),
 #endif
-#ifdef WIN32
+#ifdef _WIN32
   TRANSLATABLE("ControllerInterface", "XInput"),
   TRANSLATABLE("ControllerInterface", "DInput"),
 #endif
@@ -143,7 +143,7 @@ ControllerInterface::Backend ControllerInterface::GetDefaultBackend()
 #ifdef WITH_SDL2
   return Backend::SDL;
 #else
-#ifdef WIN32
+#ifdef _WIN32
   return Backend::XInput;
 #else
   return Backend::None;
@@ -154,7 +154,7 @@ ControllerInterface::Backend ControllerInterface::GetDefaultBackend()
 #ifdef WITH_SDL2
 #include "sdl_controller_interface.h"
 #endif
-#ifdef WIN32
+#ifdef _WIN32
 #include "dinput_controller_interface.h"
 #include "xinput_controller_interface.h"
 #endif
@@ -168,7 +168,7 @@ std::unique_ptr<ControllerInterface> ControllerInterface::Create(Backend type)
   if (type == Backend::SDL)
     return std::make_unique<SDLControllerInterface>();
 #endif
-#ifdef WIN32
+#ifdef _WIN32
   if (type == Backend::XInput)
     return std::make_unique<XInputControllerInterface>();
   if (type == Backend::DInput)

src/frontend-common/controller_interface.h

@@ -21,7 +21,7 @@ public:
 #ifdef WITH_SDL2
     SDL,
 #endif
-#ifdef WIN32
+#ifdef _WIN32
     XInput,
     DInput,
 #endif

src/frontend-common/cubeb_audio_stream.cpp

@@ -3,7 +3,7 @@
 #include "common/log.h"
 Log_SetChannel(CubebAudioStream);
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "common/windows_headers.h"
 #include <objbase.h>
 #pragma comment(lib, "Ole32.lib")
@@ -21,7 +21,7 @@ bool CubebAudioStream::OpenDevice()
 {
   Assert(!IsOpen());
 
-#ifdef WIN32
+#ifdef _WIN32
   HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
   m_com_initialized_by_us = SUCCEEDED(hr);
   if (FAILED(hr) && hr != RPC_E_CHANGED_MODE && hr != S_FALSE)
@@ -150,7 +150,7 @@ void CubebAudioStream::DestroyContext()
   cubeb_destroy(m_cubeb_context);
   m_cubeb_context = nullptr;
 
-#ifdef WIN32
+#ifdef _WIN32
   if (m_com_initialized_by_us)
     CoUninitialize();
 #endif

src/frontend-common/cubeb_audio_stream.h

@@ -30,7 +30,7 @@ protected:
   cubeb_stream* m_cubeb_stream = nullptr;
   bool m_paused = true;
 
-#ifdef WIN32
+#ifdef _WIN32
   bool m_com_initialized_by_us = false;
 #endif
 };

src/frontend-common/fullscreen_ui.cpp

@@ -2054,7 +2054,7 @@ void DrawSettingsWindow()
 
         switch (s_settings_copy.gpu_renderer)
         {
-#ifdef WIN32
+#ifdef _WIN32
           case GPURenderer::HardwareD3D11:
           {
             settings_changed |= ToggleButtonForNonSetting(
@@ -2463,7 +2463,7 @@ void DrawSettingsWindow()
           "Use Debug GPU Device", "Enable debugging when supported by the host's renderer API. Only for developer use.",
           &s_settings_copy.gpu_use_debug_device);
 
-#ifdef WIN32
+#ifdef _WIN32
         settings_changed |=
           ToggleButton("Increase Timer Resolution", "Enables more precise frame pacing at the cost of battery life.",
                        &s_settings_copy.increase_timer_resolution);

src/frontend-common/game_settings.cpp

@@ -11,7 +11,7 @@
 #include <utility>
 Log_SetChannel(GameSettings);
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "common/windows_headers.h"
 #endif
 #include "SimpleIni.h"

src/frontend-common/ini_settings_interface.h

@@ -2,7 +2,7 @@
 #include "core/settings.h"
 
 // being a pain here...
-#ifdef WIN32
+#ifdef _WIN32
 #include "common/windows_headers.h"
 #endif
 #include "SimpleIni.h"