From 8560b4adfb58f708bd0a4158999b1fa4e2e29f98 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Wed, 27 Oct 2021 19:59:28 +0200
Subject: [PATCH] Fix OpenConsoleProxy for Debug builds (#11632)

---
 src/host/proxy/Host.Proxy.vcxproj  |  1 +
 src/host/proxy/nodefaultlib_shim.h | 16 +++-------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/host/proxy/Host.Proxy.vcxproj b/src/host/proxy/Host.Proxy.vcxproj
index 5888ce0c3..ed7283eba 100644
--- a/src/host/proxy/Host.Proxy.vcxproj
+++ b/src/host/proxy/Host.Proxy.vcxproj
@@ -62,6 +62,7 @@
       <!-- Must be Stdcall on all platforms to resolve _ObjectStublessClient3 -->
       <PreprocessorDefinitions>REGISTER_PROXY_DLL;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <SDLCheck>false</SDLCheck>
       <ForcedIncludeFiles>nodefaultlib_shim.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
diff --git a/src/host/proxy/nodefaultlib_shim.h b/src/host/proxy/nodefaultlib_shim.h
index 09c0ad53c..4face4e49 100644
--- a/src/host/proxy/nodefaultlib_shim.h
+++ b/src/host/proxy/nodefaultlib_shim.h
@@ -1,18 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+#pragma once
+
 #include <guiddef.h>
 
-#if !defined(_M_IX86) && !defined(_M_X64)
-
-// ARM64 doesn't define a (__builtin_)memcmp function without CRT,
-// but we need one to compile IID_GENERIC_CHECK_IID.
-// Luckily we only ever use memcmp for IIDs.
-#pragma function(memcmp)
-inline int memcmp(const IID* a, const IID* b, size_t count)
-{
-    (void)(count);
-    return 1 - InlineIsEqualGUID(a, b);
-}
-
-#endif
+#define memcmp(a, b, c) (!InlineIsEqualGUID(a, b))