[PATCH xserver] xfree86: Move DRICreatePCIBusID to xf86Pci.h
Jon Turney
jon.turney at dronecode.org.uk
Thu Jun 22 11:51:40 UTC 2017
On 21/06/2017 20:58, Adam Jackson wrote:
> 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 */
Thanks! That fixes things for me.
Reviewed-by: Jon Turney <jon.turney at dronecode.org.uk>
More information about the xorg-devel
mailing list