From 5a813094d3e0fcf7f8ddea6200cfc2d552515501 Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Tue, 19 Feb 2019 15:51:29 -0800 Subject: [PATCH] Fix __pfnDliFailureHook2 redefinition on MSVC versions < 2015 Update 3 (#190) The const was added to __pfnDliFailureHook2 in MSVC 2015 Update 3, so any compilers before that shouldn't define it as const --- src/luvi_renamed.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/luvi_renamed.c b/src/luvi_renamed.c index 65e116c2..4678659a 100644 --- a/src/luvi_renamed.c +++ b/src/luvi_renamed.c @@ -1,8 +1,10 @@ #include "windows.h" #include "delayimp.h" -FARPROC WINAPI LoadFailureHook(unsigned dliNotify, PDelayLoadInfo pdli); +FARPROC WINAPI LoadFailureHook(unsigned dliNotify, PDelayLoadInfo pdli); +#if _MSC_FULL_VER >= 190024210 // MSVC 2015 Update 3 #ifndef DELAYIMP_INSECURE_WRITABLE_HOOKS const +#endif #endif extern PfnDliHook __pfnDliFailureHook2 = LoadFailureHook;