From 3b3e6af5777fafe2f542ee38e3bf323170fa9e98 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 7 Nov 2025 17:09:01 +0100 Subject: [PATCH] os: move OsVendorFatalError() and OsVendorInit() to ddx_priv.h These are implemented by DDX, thus should be declared in ddx_priv.h Signed-off-by: Enrico Weigelt, metux IT consult --- os/ddx_priv.h | 3 +++ os/osdep.h | 2 -- os/osinit.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/os/ddx_priv.h b/os/ddx_priv.h index 9ef4d64687..1893eebe57 100644 --- a/os/ddx_priv.h +++ b/os/ddx_priv.h @@ -25,4 +25,7 @@ void ddxGiveUp(enum ExitCode error); void ddxInputThreadInit(void); +void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0); +void OsVendorInit(void); + #endif /* _XSERVER_OS_DDX_PRIV_H */ diff --git a/os/osdep.h b/os/osdep.h index 158a4ed1cf..9422917ce6 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -148,8 +148,6 @@ typedef void (*OsSigHandlerPtr) (int sig); OsSigHandlerPtr OsSignal(int sig, OsSigHandlerPtr handler); void OsInit(void); -void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0); -void OsVendorInit(void); _X_EXPORT /* needed by the int10 module, but should not be used by OOT drivers */ void OsBlockSignals(void); diff --git a/os/osinit.c b/os/osinit.c index eb509970b0..21d594b969 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -60,6 +60,7 @@ SOFTWARE. #include "dix/dix_priv.h" #include "os/busfault.h" +#include "os/ddx_priv.h" #include "os/log_priv.h" #include "os/osdep.h" #include "os/serverlock.h"