From 013eaacdd02ac82c0511f72e6dcbc137fc4a5748 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 9 Feb 2024 17:42:35 +0100
Subject: [PATCH] xfree86: common: move private defs out of xf86VGAarbiter.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 <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1290>
---
 hw/xfree86/common/xf86.h                |  6 -----
 hw/xfree86/common/xf86Bus.c             |  2 +-
 hw/xfree86/common/xf86DPMS.c            |  2 +-
 hw/xfree86/common/xf86Init.c            |  1 +
 hw/xfree86/common/xf86VGAarbiter.c      |  2 +-
 hw/xfree86/common/xf86VGAarbiter.h      |  8 -------
 hw/xfree86/common/xf86VGAarbiter_priv.h | 32 +++++++++++++++++++++++++
 7 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 hw/xfree86/common/xf86VGAarbiter_priv.h

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 48f827069..dae11fb9f 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -126,13 +126,7 @@ extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn,
                                                  EntityProc leave,
                                                  void *private);
 #else
-#define xf86VGAarbiterInit() do {} while (0)
-#define xf86VGAarbiterFini() do {} while (0)
-#define xf86VGAarbiterLock(x) do {} while (0)
-#define xf86VGAarbiterUnlock(x) do {} while (0)
-#define xf86VGAarbiterScrnInit(x) do {} while (0)
 #define xf86VGAarbiterDeviceDecodes() do {} while (0)
-#define xf86VGAarbiterWrapFunctions() do {} while (0)
 #endif
 
 /* xf86Bus.c */
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index af1a8d715..6c3921717 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -50,7 +50,7 @@
 
 #include "xf86_OSproc.h"
 #ifdef XSERVER_LIBPCIACCESS
-#include "xf86VGAarbiter.h"
+#include "xf86VGAarbiter_priv.h"
 #endif
 /* Entity data */
 EntityPtr *xf86Entities = NULL; /* Bus slots claimed by drivers */
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index ee495483e..7fec44087 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -44,7 +44,7 @@
 #include "dpmsproc.h"
 #endif
 #ifdef XSERVER_LIBPCIACCESS
-#include "xf86VGAarbiter.h"
+#include "xf86VGAarbiter_priv.h"
 #endif
 
 #ifdef DPMSExtension
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 92004dd79..b2dd37510 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -64,6 +64,7 @@
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "systemd-logind.h"
+#include "xf86VGAarbiter_priv.h"
 #include "loaderProcs.h"
 
 #include "xf86Module_priv.h"
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index 9db8d044f..55487b48b 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -30,7 +30,7 @@
 
 #include "xorg-config.h"
 
-#include "xf86VGAarbiter.h"
+#include "xf86VGAarbiter_priv.h"
 #include "xf86VGAarbiterPriv.h"
 #include "xf86Bus.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/common/xf86VGAarbiter.h b/hw/xfree86/common/xf86VGAarbiter.h
index bb52cf78a..260d366d4 100644
--- a/hw/xfree86/common/xf86VGAarbiter.h
+++ b/hw/xfree86/common/xf86VGAarbiter.h
@@ -30,14 +30,6 @@
 #include "misc.h"
 #include "xf86.h"
 
-/* Functions */
-extern void xf86VGAarbiterInit(void);
-extern void xf86VGAarbiterFini(void);
-void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn);
-extern Bool xf86VGAarbiterWrapFunctions(void);
-extern void xf86VGAarbiterLock(ScrnInfoPtr pScrn);
-extern void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn);
-
 /* allow a driver to remove itself from arbiter - really should be
  * done in the kernel though */
 extern _X_EXPORT void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc);
diff --git a/hw/xfree86/common/xf86VGAarbiter_priv.h b/hw/xfree86/common/xf86VGAarbiter_priv.h
new file mode 100644
index 000000000..5c23d83d3
--- /dev/null
+++ b/hw/xfree86/common/xf86VGAarbiter_priv.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_XF86VGAARBITERPRIV_H
+#define _XSERVER_XF86VGAARBITERPRIV_H
+
+#include <X11/Xdefs.h>
+
+#include "xf86VGAarbiter.h"
+
+#ifdef XSERVER_LIBPCIACCESS
+
+void xf86VGAarbiterInit(void);
+void xf86VGAarbiterFini(void);
+void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn);
+Bool xf86VGAarbiterWrapFunctions(void);
+void xf86VGAarbiterLock(ScrnInfoPtr pScrn);
+void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn);
+
+#else /* XSERVER_LIBPCIACCESS */
+
+static inline void xf86VGAarbiterInit() {}
+static inline void xf86VGAarbiterFini() {}
+static inline void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}
+static inline void xf86VGAarbiterWrapFunctions(void) { return FALSE; }
+static inline void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {}
+static inline void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* _XSERVER_XF86VGAARBITERPRIV_H */