xfree86: os-support: unexport xf86OSRingBell()

This function is only internal to xfree86 DDX, not used by any drivers,
thus no need to export it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1456>

7 files changed, 7 insertions, 4 deletions

diff --git a/hw/xfree86/os-support/bsd/bsd_bell.c b/hw/xfree86/os-support/bsd/bsd_bell.c
index 19d1f4882..2b0bba2f6 100644
--- a/hw/xfree86/os-support/bsd/bsd_bell.c
+++ b/hw/xfree86/os-support/bsd/bsd_bell.c
@@ -35,6 +35,7 @@
 
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
 
 void
diff --git a/hw/xfree86/os-support/hurd/hurd_bell.c b/hw/xfree86/os-support/hurd/hurd_bell.c
index 33965a44c..0c155dd68 100644
--- a/hw/xfree86/os-support/hurd/hurd_bell.c
+++ b/hw/xfree86/os-support/hurd/hurd_bell.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "xf86.h"
+#include "xf86_os_support.h"
 #include "xf86Priv.h"
 
 void
diff --git a/hw/xfree86/os-support/linux/lnx_bell.c b/hw/xfree86/os-support/linux/lnx_bell.c
index e1d3cbf17..e58b9ec80 100644
--- a/hw/xfree86/os-support/linux/lnx_bell.c
+++ b/hw/xfree86/os-support/linux/lnx_bell.c
@@ -30,9 +30,8 @@
 #include <sys/ioctl.h>
 #include <linux/kd.h>
 
-#include "xf86.h"
 #include "xf86Priv.h"
-#include "xf86_OSproc.h"
+#include "xf86_os_support.h"
 
 void
 xf86OSRingBell(int loudness, int pitch, int duration)
diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index 6aa0a37a3..d08474516 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -33,6 +33,7 @@
 
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
 
 #define BELL_RATE       48000   /* Samples per second */
diff --git a/hw/xfree86/os-support/stub/stub_bell.c b/hw/xfree86/os-support/stub/stub_bell.c
index 48625928f..a06aed659 100644
--- a/hw/xfree86/os-support/stub/stub_bell.c
+++ b/hw/xfree86/os-support/stub/stub_bell.c
@@ -2,7 +2,7 @@
 #include <xorg-config.h>
 #endif
 
-#include "xf86_OSlib.h"
+#include "xf86_os_support.h"
 
 void
 xf86OSRingBell(int loudness, int pitch, int duration)
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 19ebbde48..26f452d44 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -118,7 +118,6 @@ extern _X_EXPORT void xf86DisableIO(void);
 extern _X_EXPORT void xf86SetTVOut(int);
 extern _X_EXPORT void xf86SetRGBOut(void);
 #endif
-extern _X_EXPORT void xf86OSRingBell(int, int, int);
 extern _X_EXPORT void xf86SlowBcopy(unsigned char *, unsigned char *, int);
 extern _X_EXPORT int xf86OpenSerial(XF86OptionPtr options);
 extern _X_EXPORT int xf86SetSerial(int fd, XF86OptionPtr options);
diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h
index a21aa9bf5..30098a804 100644
--- a/hw/xfree86/os-support/xf86_os_support.h
+++ b/hw/xfree86/os-support/xf86_os_support.h
@@ -24,4 +24,6 @@ void xf86UseMsg(void);
 PMClose xf86OSPMOpen(void);
 void xf86InitVidMem(void);
 
+void xf86OSRingBell(int volume, int pitch, int duration);
+
 #endif /* _XSERVER_XF86_OS_SUPPORT */