summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Weigelt, metux IT consult <info@metux.net>2024-02-22 15:18:54 +0100
committerMarge Bot <emma+marge@anholt.net>2024-04-15 23:59:38 +0000
commit76d01e9bf601153aacd3c895fc0480b736a23b02 (patch)
tree47abb1daec7faddeb3b061be777db419bc1e26e9
parent1205f5b6f9c4aaa625ebe1aa6e9375e13632f9a9 (diff)
os: unexport OsVendorVErrorFProc pointer
This pointer allows a DDX to install it's own error print handler. It's really only intended for DDXes, thus no need to have it exported to modules. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1369>
-rw-r--r--hw/xwin/InitOutput.c3
-rw-r--r--hw/xwin/winprocarg.c1
-rw-r--r--include/os.h4
-rw-r--r--os/osdep.h4
4 files changed, 8 insertions, 4 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index ddaa31964..ca4b6bf0a 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -31,6 +31,9 @@ from The Open Group.
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
+
+#include "os/osdep.h"
+
#include "win.h"
#include "winmsg.h"
#include "winconfig.h"
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index bff378ce3..9142cc5d0 100644
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -36,6 +36,7 @@ from The Open Group.
#endif
#include "os/cmdline.h"
+#include "os/osdep.h"
#include <../xfree86/common/xorgVersion.h>
#include "win.h"
diff --git a/include/os.h b/include/os.h
index 08a546878..e0b9afd38 100644
--- a/include/os.h
+++ b/include/os.h
@@ -90,10 +90,6 @@ typedef struct _NewClientRec *NewClientPtr;
extern void ddxBeforeReset(void);
#endif
-extern _X_EXPORT void (*OsVendorVErrorFProc) (const char *,
- va_list args)
-_X_ATTRIBUTE_PRINTF(1, 0);
-
extern _X_EXPORT Bool WaitForSomething(Bool clients_are_ready);
extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client */ );
diff --git a/os/osdep.h b/os/osdep.h
index b6120eef2..97e227cfa 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -170,4 +170,8 @@ int os_move_fd(int fd);
depending on whether multithreading is used */
int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);
+/* callback for DDX specific error printing, if any (may be NULL) */
+extern void (*OsVendorVErrorFProc) (const char *, va_list args)
+ _X_ATTRIBUTE_PRINTF(1, 0);
+
#endif /* _OSDEP_H_ */