[PATCH xserver] xfree86: Move DRICreatePCIBusID to xf86Pci.h

Adam Jackson ajax at redhat.com
Wed Jun 21 19:58:43 UTC 2017


xf86str.h is parsed into sdksyms unconditionally but the symbol is only
defined when building with PCI support. Move the decl to a header that
sdksyms only parses when building PCI support.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/xfree86/common/xf86str.h         | 2 --
 hw/xfree86/os-support/bus/xf86Pci.h | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 79c4c9daf..edd91c745 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -771,6 +771,4 @@ typedef enum {
     ACTION_SWITCHSCREEN_PREV,
 } ActionEvent;
 
-extern _X_EXPORT char *DRICreatePCIBusID(const struct pci_device *dev);
-
 #endif                          /* _XF86STR_H */
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index 210ab3d89..4dbe08bd7 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -234,5 +234,6 @@
 
 /* Public PCI access functions */
 extern _X_EXPORT Bool xf86scanpci(void);
+extern _X_EXPORT char *DRICreatePCIBusID(const struct pci_device *dev);
 
 #endif                          /* _XF86PCI_H */
-- 
2.13.0



More information about the xorg-devel mailing list