From 27233c3fa168bf232c38635f4d5609e73dcffe43 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 9 Feb 2024 17:12:36 +0100 Subject: [PATCH] xfree86: common: move private defs from xf86_OSproc.h to xf86OSpriv.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 --- hw/xfree86/common/xf86platformBus.c | 1 + hw/xfree86/os-support/shared/drm_platform.c | 1 + hw/xfree86/os-support/xf86OSpriv.h | 9 +++++++++ hw/xfree86/os-support/xf86_OSproc.h | 9 --------- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 47a905ee3..07f35438f 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -50,6 +50,7 @@ #include "xf86platformBus_priv.h" #include "xf86Config.h" #include "xf86Crtc.h" +#include "xf86OSpriv.h" #include "randrstr.h" int platformSlotClaimed; diff --git a/hw/xfree86/os-support/shared/drm_platform.c b/hw/xfree86/os-support/shared/drm_platform.c index 83805fffe..60d436bc3 100644 --- a/hw/xfree86/os-support/shared/drm_platform.c +++ b/hw/xfree86/os-support/shared/drm_platform.c @@ -18,6 +18,7 @@ #include "xf86Bus.h" #include "hotplug.h" +#include "xf86OSpriv.h" #include "systemd-logind.h" static Bool diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h index ce1ec33a1..5cb8188e9 100644 --- a/hw/xfree86/os-support/xf86OSpriv.h +++ b/hw/xfree86/os-support/xf86OSpriv.h @@ -38,4 +38,13 @@ typedef struct { void xf86OSInitVidMem(VidMemInfoPtr); +#ifdef XSERVER_PLATFORM_BUS +#include "hotplug.h" +void +xf86PlatformDeviceProbe(struct OdevAttributes *attribs); + +void +xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs); +#endif + #endif /* _XF86OSPRIV_H */ diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 05a7cd820..1a6853fb6 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -188,15 +188,6 @@ extern _X_EXPORT void xf86InitVidMem(void); #endif /* XF86_OS_PRIVS */ -#ifdef XSERVER_PLATFORM_BUS -#include "hotplug.h" -void -xf86PlatformDeviceProbe(struct OdevAttributes *attribs); - -void -xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs); -#endif - _XFUNCPROTOEND #endif /* NO_OSLIB_PROTOTYPES */ #endif /* _XF86_OSPROC_H */