summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2017-06-21 15:58:43 -0400
committerAdam Jackson <ajax@redhat.com>2017-06-22 10:53:08 -0400
commit5c8fb7d128e312e6c01cd40c7ada072c4b5f3776 (patch)
treef012c8ef0c6dc71b7084a52f937cc9980d6ca900
parent525db17e04d5cabaeefd20e38cebe7d606047a76 (diff)
xfree86: Move DRICreatePCIBusID to xf86Pci.h
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@redhat.com> Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
-rw-r--r--hw/xfree86/common/xf86str.h2
-rw-r--r--hw/xfree86/os-support/bus/xf86Pci.h1
2 files changed, 1 insertions, 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 */