From 237f3d4f485ea9cf09e3d9e09a8a05c12b72d2f7 Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@windows.microsoft.com>
Date: Fri, 8 Jan 2021 13:31:20 -0800
Subject: [PATCH] Fix initial WIN32 detection

---
 DDSTextureLoader/DDSTextureLoader12.h | 2 +-
 DirectXTex/DirectXTex.h               | 2 +-
 DirectXTex/DirectXTexP.h              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DDSTextureLoader/DDSTextureLoader12.h b/DDSTextureLoader/DDSTextureLoader12.h
index 0e14a62..a1f2e11 100644
--- a/DDSTextureLoader/DDSTextureLoader12.h
+++ b/DDSTextureLoader/DDSTextureLoader12.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#if defined(WIN32) || defined(WINAPI_FAMILY)
+#if defined(WIN32) || defined(_WIN32)
 #include <d3d12.h>
 #else
 #include <wsl/winadapter.h>
diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h
index 96da493..611d43d 100644
--- a/DirectXTex/DirectXTex.h
+++ b/DirectXTex/DirectXTex.h
@@ -17,7 +17,7 @@
 #include <utility>
 #include <vector>
 
-#if defined(WIN32) || defined(WINAPI_FAMILY)
+#if defined(WIN32) || defined(_WIN32)
 #if !defined(__d3d11_h__) && !defined(__d3d11_x_h__) && !defined(__d3d12_h__) && !defined(__d3d12_x_h__) && !defined(__XBOX_D3D12_X__)
 #ifdef _GAMING_XBOX_SCARLETT
 #include <d3d12_xs.h>
diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h
index 63afd68..a2195b4 100644
--- a/DirectXTex/DirectXTexP.h
+++ b/DirectXTex/DirectXTexP.h
@@ -70,7 +70,7 @@
 #pragma clang diagnostic ignored "-Wunknown-pragmas"
 #endif
 
-#if defined(WIN32) || defined(WINAPI_FAMILY)
+#if defined(WIN32) || defined(_WIN32)
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif