From e5904542d6bd3bba962f806096e4c1c757312bc1 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Sun, 11 Feb 2018 23:37:34 +0100 Subject: [PATCH] [DELAYIMP] Fix/Merge definitions of __pfnDliNotifyHook2 and __pfnDliFailureHook2 --- sdk/lib/delayimp/delayimp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk/lib/delayimp/delayimp.c b/sdk/lib/delayimp/delayimp.c index e3f97b085b8..0f86b67f2bd 100644 --- a/sdk/lib/delayimp/delayimp.c +++ b/sdk/lib/delayimp/delayimp.c @@ -15,14 +15,11 @@ /**** Linker magic: provide a default (NULL) pointer, but allow the user to override it ****/ -#if defined(__GNUC__) +/* The actual items we use */ PfnDliHook __pfnDliNotifyHook2; PfnDliHook __pfnDliFailureHook2; -#else -/* The actual items we use */ -extern PfnDliHook __pfnDliNotifyHook2; -extern PfnDliHook __pfnDliFailureHook2; +#if !defined(__GNUC__) /* The fallback symbols */ PfnDliHook __pfnDliNotifyHook2Default = NULL; PfnDliHook __pfnDliFailureHook2Default = NULL;