From 13a16de3104265bd9085c68aa682bc981eeeb527 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 7 Feb 2025 14:17:18 +0100 Subject: [PATCH] Revert "xfree86: loader: drop unused LoaderShouldIgnoreABI()" This reverts commit d8c47a3db65e37f5afb1876a621b135c186cfd6f. Proprietary NVidia driver needs it. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- hw/xfree86/common/xf86Module.h | 1 + hw/xfree86/loader/loader.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index e06ea21c0..d5962e833 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -154,6 +154,7 @@ extern _X_EXPORT void *LoadSubModule(void *, const char *, const char **, extern _X_EXPORT void *LoaderSymbol(const char *); extern _X_EXPORT void *LoaderSymbolFromModule(void *, const char *); extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int); +extern _X_EXPORT Bool LoaderShouldIgnoreABI(void); extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass); typedef void *(*ModuleSetupProc) (void *, void *, int *, int *); diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 5ba41813c..5af7a54f3 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -154,6 +154,12 @@ LoaderSetOptions(unsigned long opts) LoaderOptions |= opts; } +Bool +LoaderShouldIgnoreABI(void) +{ + return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0; +} + int LoaderGetABIVersion(const char *abiclass) {