xserver: Branch 'master'

[GitLab Mirror]

 include/os.h |    2 --
 os/osdep.h   |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 934b771f7a8285a59491190620e6118aedfd511c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 7 12:13:11 2024 +0100

    os: unexport AutoResetServer()
    
    This is an internal function, not used and not supposed to be used by
    any drivers, so shouldn't have been exported in the first place.
    
    Fixes: 49f77fff1495c0a2050fb18f9b1fc627839bbfc2
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1372>

diff --git a/include/os.h b/include/os.h
index 7b252562e..ac5c9ee9d 100644
--- a/include/os.h
+++ b/include/os.h
@@ -198,8 +198,6 @@ extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */ );
 extern _X_EXPORT void SetScreenSaverTimer(void);
 extern _X_EXPORT void FreeScreenSaverTimer(void);
 
-extern _X_EXPORT void AutoResetServer(int /*sig */ );
-
 extern _X_EXPORT void GiveUp(int /*sig */ );
 
 extern _X_EXPORT void UseMsg(void);
diff --git a/os/osdep.h b/os/osdep.h
index 385eddc44..04d0a827b 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -144,4 +144,6 @@ static inline void uname(struct utsname *uts) {
 }
 #endif /* WIN32 */
 
+void AutoResetServer(int sig);
+
 #endif                          /* _OSDEP_H_ */