From 63d671ee9b22b503810f364b7cf92937a86e01c8 Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@windows.microsoft.com>
Date: Wed, 14 Apr 2021 17:59:56 -0700
Subject: [PATCH] Fixed -Wnonportable-system-include-path when using Windows
 Insider SDK

---
 DirectXTex/DirectXTex.h   | 4 ++++
 ScreenGrab/ScreenGrab11.h | 5 +++++
 ScreenGrab/ScreenGrab12.h | 4 ++++
 ScreenGrab/ScreenGrab9.h  | 5 +++++
 4 files changed, 18 insertions(+)

diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h
index 597967f..e66383f 100644
--- a/DirectXTex/DirectXTex.h
+++ b/DirectXTex/DirectXTex.h
@@ -37,7 +37,11 @@
 #include <DirectXMath.h>
 
 #ifdef WIN32
+#ifdef NTDDI_WIN10_FE
+#include <ocidl.h>
+#else
 #include <OCIdl.h>
+#endif
 
 struct IWICImagingFactory;
 struct IWICMetadataQueryReader;
diff --git a/ScreenGrab/ScreenGrab11.h b/ScreenGrab/ScreenGrab11.h
index 592b857..da1a300 100644
--- a/ScreenGrab/ScreenGrab11.h
+++ b/ScreenGrab/ScreenGrab11.h
@@ -19,7 +19,12 @@
 
 #include <d3d11_1.h>
 
+#ifdef NTDDI_WIN10_FE
+#include <ocidl.h>
+#else
 #include <OCIdl.h>
+#endif
+
 #include <functional>
 
 
diff --git a/ScreenGrab/ScreenGrab12.h b/ScreenGrab/ScreenGrab12.h
index 8355923..c57a052 100644
--- a/ScreenGrab/ScreenGrab12.h
+++ b/ScreenGrab/ScreenGrab12.h
@@ -20,7 +20,11 @@
 #ifdef WIN32
 #include <d3d12.h>
 
+#ifdef NTDDI_WIN10_FE
+#include <ocidl.h>
+#else
 #include <OCIdl.h>
+#endif
 
 #include <functional>
 #else
diff --git a/ScreenGrab/ScreenGrab9.h b/ScreenGrab/ScreenGrab9.h
index da488fb..8a33654 100644
--- a/ScreenGrab/ScreenGrab9.h
+++ b/ScreenGrab/ScreenGrab9.h
@@ -23,7 +23,12 @@
 
 #include <d3d9.h>
 
+#ifdef NTDDI_WIN10_FE
+#include <ocidl.h>
+#else
 #include <OCIdl.h>
+#endif
+
 #include <functional>