xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86str.h         |    2 --
 hw/xfree86/os-support/bus/xf86Pci.h |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5c8fb7d128e312e6c01cd40c7ada072c4b5f3776
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jun 21 15:58:43 2017 -0400

    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 at redhat.com>
    Reviewed-by: Jon Turney <jon.turney at dronecode.org.uk>

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 */