xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/bus/Pci.h     |    4 ++++
 hw/xfree86/os-support/bus/xf86Pci.h |    5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit e10283d8424237914bb48f914024239d571f9d05
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Feb 17 15:25:59 2025 +0100

    xfree86: os-support: unexport xf86scanpci()
    
    Not used by any drivers/modules, so no need to keep it exported.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1800>

diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 8167b3e0a..5e11cf3df 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -106,6 +106,8 @@
 #ifndef _PCI_H
 #define _PCI_H 1
 
+#include <X11/Xdefs.h>
+
 #include "xf86Pci.h"
 
 /*
@@ -135,4 +137,6 @@
 #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
 #define PCI_TAG_NO_DOMAIN(tag) ((tag) & 0x00ffff00u)
 
+Bool xf86scanpci(void);
+
 #endif                          /* _PCI_H */
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index 4dbe08bd7..88cebcf1c 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -228,12 +228,7 @@
 #define PCI_REG_USERCONFIG		0x40
 #define PCI_OPTION_REG			0x40
 
-/*
- * Typedefs, etc...
- */
-
 /* Public PCI access functions */
-extern _X_EXPORT Bool xf86scanpci(void);
 extern _X_EXPORT char *DRICreatePCIBusID(const struct pci_device *dev);
 
 #endif                          /* _XF86PCI_H */