xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Helper.c      |    1 -
 hw/xfree86/common/xf86Init.c        |    1 -
 hw/xfree86/common/xf86Module.h      |    2 ++
 hw/xfree86/common/xf86Module_priv.h |   22 ----------------------
 hw/xfree86/common/xf86Xinput.c      |    1 -
 hw/xfree86/loader/loadmod.c         |    9 ++++++---
 6 files changed, 8 insertions(+), 28 deletions(-)

New commits:
commit 6a49a358e343d4f9e861ac8e945fd6d616c03aa2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jun 23 17:35:44 2025 -0700

    Revert "xfree86: common: unexport UnloadModule() and UnloadSubModule()"
    
    This reverts commit 00f69564c5fa1bc9ead59a4412aa852f6f06c241.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2037>

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index d12fd3961..430482c38 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -61,7 +61,6 @@
 #include "xf86InPriv.h"
 #include "xf86Config.h"
 #include "mivalidate.h"
-#include "xf86Module_priv.h"
 
 /* For xf86GetClocks */
 #if defined(CSRG_BASED) || defined(__GNU__)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 92004dd79..0d10794bb 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -66,7 +66,6 @@
 #include "systemd-logind.h"
 #include "loaderProcs.h"
 
-#include "xf86Module_priv.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Config.h"
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index d5962e833..96dfa8e56 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -151,6 +151,8 @@ typedef struct {
 extern _X_EXPORT void *LoadSubModule(void *, const char *, const char **,
                                        const char **, void *,
                                        const XF86ModReqInfo *, int *, int *);
+extern _X_EXPORT void UnloadSubModule(void *);
+extern _X_EXPORT void UnloadModule(void *);
 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);
diff --git a/hw/xfree86/common/xf86Module_priv.h b/hw/xfree86/common/xf86Module_priv.h
deleted file mode 100644
index 8a5995382..000000000
--- a/hw/xfree86/common/xf86Module_priv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
- */
-#ifndef _XORG_XF86MODULE_PRIV_H
-#define _XORG_XF86MODULE_PRIV_H
-
-/*
- * unload a previously loaded module
- *
- * @param mod the module to unload
- */
-void UnloadModule(ModuleDescPtr mod);
-
-/*
- * unload a previously loaded sun-module
- *
- * @param mod the sub-module to unload
- */
-void UnloadSubModule(ModuleDescPtr mod);
-
-#endif /* _XORG_XF86MODULE_PRIV_H */
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index d0f9db52e..2d310cc58 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -76,7 +76,6 @@
 #include "eventstr.h"
 #include "inpututils.h"
 #include "optionstr.h"
-#include "xf86Module_priv.h"
 
 #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 2edc14ac7..9bb7aa47b 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -55,7 +55,6 @@
 #include "loaderProcs.h"
 #include "xf86Module.h"
 #include "loader.h"
-#include "xf86Module_priv.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -841,8 +840,10 @@ LoadModule(const char *module, void *options, const XF86ModReqInfo *modreq,
 }
 
 void
-UnloadModule(ModuleDescPtr mod)
+UnloadModule(void *_mod)
 {
+    ModuleDescPtr mod = _mod;
+
     if (mod == (ModuleDescPtr) 1)
         return;
 
@@ -872,8 +873,10 @@ UnloadModule(ModuleDescPtr mod)
 }
 
 void
-UnloadSubModule(ModuleDescPtr mod)
+UnloadSubModule(void *_mod)
 {
+    ModuleDescPtr mod = (ModuleDescPtr) _mod;
+
     /* Some drivers are calling us on built-in submodules, ignore them */
     if (mod == (ModuleDescPtr) 1)
         return;