From df09fe48cf5e398f4d369256aa76029a88757656 Mon Sep 17 00:00:00 2001
From: Till Rathmann <till.rathmann@gmx.de>
Date: Wed, 1 Aug 2018 14:44:39 +0200
Subject: [PATCH] Workaround in nfd_win.cpp for MSVC problem in combaseapi.h.

---
 nfd/nfd_win.cpp                      | 3 +++
 standalone/build/win32/Tracy.vcxproj | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nfd/nfd_win.cpp b/nfd/nfd_win.cpp
index a73fd8a4..37d9b774 100644
--- a/nfd/nfd_win.cpp
+++ b/nfd/nfd_win.cpp
@@ -19,7 +19,10 @@
 #include <stdio.h>
 #include <assert.h>
 #include <windows.h>
+
+struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here" when using /permissive-
 #include <ShObjIdl.h>
+
 #include "nfd_common.h"
 
 
diff --git a/standalone/build/win32/Tracy.vcxproj b/standalone/build/win32/Tracy.vcxproj
index db9c9a3e..fd2651ad 100644
--- a/standalone/build/win32/Tracy.vcxproj
+++ b/standalone/build/win32/Tracy.vcxproj
@@ -100,10 +100,7 @@
     <ClCompile Include="..\..\..\imgui\imgui_demo.cpp" />
     <ClCompile Include="..\..\..\imgui\imgui_draw.cpp" />
     <ClCompile Include="..\..\..\nfd\nfd_common.c" />
-    <ClCompile Include="..\..\..\nfd\nfd_win.cpp">
-      <ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ConformanceMode>
-      <ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ConformanceMode>
-    </ClCompile>
+    <ClCompile Include="..\..\..\nfd\nfd_win.cpp" />
     <ClCompile Include="..\..\..\server\TracyBadVersion.cpp" />
     <ClCompile Include="..\..\..\server\TracyMemory.cpp" />
     <ClCompile Include="..\..\..\server\TracyView.cpp" />