frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "xfree86: loader: drop unused LoaderShouldIgnoreABI()" 

This reverts commit d8c47a3db6.

Proprietary NVidia driver needs it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1773>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-07 14:17:18 +01:00
parent ea118d3897
commit 13a16de310
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/common/xf86Module.h
View File

@ -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 *LoaderSymbol(const char *);
extern _X_EXPORT void *LoaderSymbolFromModule(void *, const char *); extern _X_EXPORT void *LoaderSymbolFromModule(void *, const char *);
extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int); 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); extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass);
typedef void *(*ModuleSetupProc) (void *, void *, int *, int *); typedef void *(*ModuleSetupProc) (void *, void *, int *, int *);

6
hw/xfree86/loader/loader.c
View File

@ -154,6 +154,12 @@ LoaderSetOptions(unsigned long opts)
LoaderOptions |= opts; LoaderOptions |= opts;
} }
Bool
LoaderShouldIgnoreABI(void)
{
return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0;
}
int int
LoaderGetABIVersion(const char *abiclass) LoaderGetABIVersion(const char *abiclass)
{ {