From 1f77e400455e6986a066bdb2d517bf10388ae86c Mon Sep 17 00:00:00 2001
From: Filip Strugar <fstrugar@users.noreply.github.com>
Date: Wed, 11 Dec 2019 20:04:52 +0000
Subject: [PATCH] Added #ifdef around 'enum DDS_ALPHA_MODE' definition Allow
 DDSTextureLoader.h and DDSTextureLoader12.h to be included together. The same
 for 'enum WIC_LOADER_FLAGS'. (#153)

---
 DDSTextureLoader/DDSTextureLoader.h   | 3 +++
 DDSTextureLoader/DDSTextureLoader12.h | 3 +++
 WICTextureLoader/WICTextureLoader.h   | 3 +++
 WICTextureLoader/WICTextureLoader12.h | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/DDSTextureLoader/DDSTextureLoader.h b/DDSTextureLoader/DDSTextureLoader.h
index 8f39366..69a2249 100644
--- a/DDSTextureLoader/DDSTextureLoader.h
+++ b/DDSTextureLoader/DDSTextureLoader.h
@@ -22,6 +22,8 @@
 
 namespace DirectX
 {
+#ifndef DDS_ALPHA_MODE_DEFINED
+#define DDS_ALPHA_MODE_DEFINED
     enum DDS_ALPHA_MODE
     {
         DDS_ALPHA_MODE_UNKNOWN       = 0,
@@ -30,6 +32,7 @@ namespace DirectX
         DDS_ALPHA_MODE_OPAQUE        = 3,
         DDS_ALPHA_MODE_CUSTOM        = 4,
     };
+#endif
 
     // Standard version
     HRESULT CreateDDSTextureFromMemory(
diff --git a/DDSTextureLoader/DDSTextureLoader12.h b/DDSTextureLoader/DDSTextureLoader12.h
index cc9f873..3e1e925 100644
--- a/DDSTextureLoader/DDSTextureLoader12.h
+++ b/DDSTextureLoader/DDSTextureLoader12.h
@@ -25,6 +25,8 @@
 
 namespace DirectX
 {
+#ifndef DDS_ALPHA_MODE_DEFINED
+#define DDS_ALPHA_MODE_DEFINED
     enum DDS_ALPHA_MODE
     {
         DDS_ALPHA_MODE_UNKNOWN       = 0,
@@ -33,6 +35,7 @@ namespace DirectX
         DDS_ALPHA_MODE_OPAQUE        = 3,
         DDS_ALPHA_MODE_CUSTOM        = 4,
     };
+#endif
 
     enum DDS_LOADER_FLAGS
     {
diff --git a/WICTextureLoader/WICTextureLoader.h b/WICTextureLoader/WICTextureLoader.h
index 142a050..1795097 100644
--- a/WICTextureLoader/WICTextureLoader.h
+++ b/WICTextureLoader/WICTextureLoader.h
@@ -29,12 +29,15 @@
 
 namespace DirectX
 {
+#ifndef WIC_LOADER_FLAGS_DEFINED
+#define WIC_LOADER_FLAGS_DEFINED
     enum WIC_LOADER_FLAGS
     {
         WIC_LOADER_DEFAULT      = 0,
         WIC_LOADER_FORCE_SRGB   = 0x1,
         WIC_LOADER_IGNORE_SRGB  = 0x2,
     };
+#endif
 
     // Standard version
     HRESULT CreateWICTextureFromMemory(
diff --git a/WICTextureLoader/WICTextureLoader12.h b/WICTextureLoader/WICTextureLoader12.h
index 8d44022..ac26851 100644
--- a/WICTextureLoader/WICTextureLoader12.h
+++ b/WICTextureLoader/WICTextureLoader12.h
@@ -27,6 +27,8 @@
 
 namespace DirectX
 {
+#ifndef WIC_LOADER_FLAGS_DEFINED
+#define WIC_LOADER_FLAGS_DEFINED
     enum WIC_LOADER_FLAGS
     {
         WIC_LOADER_DEFAULT = 0,
@@ -35,6 +37,7 @@ namespace DirectX
         WIC_LOADER_MIP_AUTOGEN = 0x4,
         WIC_LOADER_MIP_RESERVE = 0x8,
     };
+#endif
 
     // Standard version
     HRESULT __cdecl LoadWICTextureFromMemory(