From 50d1a98c6a3b49fb34c9d9efc6aa0bee24e4597f Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 9 Feb 2024 16:26:32 +0100 Subject: [PATCH] xfree86: common: move private defs out of xf86sbusBus.h public server module API headers shouldn't be clobbered with non-exported definitions, so move them out to private header file. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- hw/xfree86/common/xf86sbusBus.h | 4 ---- hw/xfree86/common/xf86sbusBus_priv.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 hw/xfree86/common/xf86sbusBus_priv.h diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 9cfcbc574..acbc6c04d 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -104,8 +104,4 @@ extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode); extern _X_EXPORT int sparcPromPathname2Node(const char *pathName); extern _X_EXPORT char *sparcDriverName(void); -extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus); -extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, - GDevRec * GDev); - #endif /* _XF86_SBUSBUS_H */ diff --git a/hw/xfree86/common/xf86sbusBus_priv.h b/hw/xfree86/common/xf86sbusBus_priv.h new file mode 100644 index 000000000..797044718 --- /dev/null +++ b/hw/xfree86/common/xf86sbusBus_priv.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 2024 Enrico Weigelt, metux IT consult + * Copyright © 2000 Jakub Jelinek (jakub@redhat.com) + */ +#ifndef _XSERVER_XF86_SBUSBUS_H +#define _XSERVER_XF86_SBUSBUS_H + +#include + +#include "xf86sbusBus.h" + +Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus); +void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec* GDev); + +#endif /* _XSERVER_XF86_SBUSBUS_H */