diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-03-14 15:21:04 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-04-18 00:40:39 +0000 |
| commit | 0f715b4ca49b8c0814e540574cc97f31c3b7ec34 (patch) | |
| tree | d214cb3171c6b7fa86978f5abb7c6680d65b994c | |
| parent | 7429f8ee8fcc327b36b4163f95ae941bc7ba7343 (diff) | |
xfree86: os-support: move hidden Solaris-specific symbols out of public header
These aren't exported at all, so no need to have it in public header.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1456>
| -rw-r--r-- | hw/xfree86/common/xf86AutoConfig.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/solaris/sun_init.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86_OSlib.h | 6 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86_os_support.h | 8 |
4 files changed, 10 insertions, 7 deletions
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 2b8e0060e..6eb3705c2 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -39,6 +39,7 @@ #include "xf86Config.h" #include "xf86MatchDrivers.h" #include "xf86Priv.h" +#include "xf86_os_support.h" #include "xf86_OSlib.h" #include "xf86platformBus.h" #include "xf86pciBus.h" diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index a86c814cb..2197df6f2 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -67,7 +67,7 @@ static char consoleDev[PATH_MAX] = "/dev/fb"; /* Set by -dev argument on CLI Used by hw/xfree86/common/xf86AutoConfig.c for VIS_GETIDENTIFIER */ -_X_HIDDEN char xf86SolarisFbDev[PATH_MAX] = "/dev/fb"; +char xf86SolarisFbDev[PATH_MAX] = "/dev/fb"; #ifdef HAS_USL_VTS static void diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index b33501a5e..7bdacb9e9 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -104,15 +104,9 @@ #endif #include <sys/kd.h> #include <sys/vt.h> - -extern _X_HIDDEN void xf86VTAcquire(int); -extern _X_HIDDEN void xf86VTRelease(int); #endif #if defined(__sun) -#include <sys/fbio.h> -extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX]; - #include <sys/kbd.h> #include <sys/kbio.h> diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h index a4fe01346..a45716cf4 100644 --- a/hw/xfree86/os-support/xf86_os_support.h +++ b/hw/xfree86/os-support/xf86_os_support.h @@ -59,4 +59,12 @@ void xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs); #endif +#if defined(__sun) +extern char xf86SolarisFbDev[PATH_MAX]; + +/* these are only used inside sun-specific os-support */ +void xf86VTAcquire(int); +void xf86VTRelease(int); +#endif + #endif /* _XSERVER_XF86_OS_SUPPORT */ |