xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Module.h |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 538a6dd76feab02ab618d1c38e693a64b371cd66
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Jun 12 17:26:46 2025 -0700

    Revert "xfree86: mark LoaderShouldIgnoreABI() and LoaderGetABIVersion() deprecated"
    
    This reverts commit 4f2c6c98b7d178c97ac716d298d3369a5b8b2a55.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2017>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 307713cf8..d5962e833 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -154,10 +154,8 @@ 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);
-
-/* deprecated, only kept for backwards compat w/ proprietary NVidia driver */
-extern _X_EXPORT Bool LoaderShouldIgnoreABI(void) _X_DEPRECATED;
-extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass) _X_DEPRECATED;
+extern _X_EXPORT Bool LoaderShouldIgnoreABI(void);
+extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass);
 
 typedef void *(*ModuleSetupProc) (void *, void *, int *, int *);
 typedef void (*ModuleTearDownProc) (void *);