Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73292 )
Change subject: include/pci.h: Use __has_include() macro to test pci.h path ......................................................................
include/pci.h: Use __has_include() macro to test pci.h path
Some NetBSDs have the pci.h under pciutils/ instead of pci/. But we can't say for sure which variants uses which include path. Just test them with the __has_include() compiler macro. https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005finclude.html
Change-Id: Ib20de6bffede910b89937f554b4d56f4799f0762 Signed-off-by: Thomas Heijligen thomas.heijligen@secunet.com --- M include/platform/pci.h 1 file changed, 22 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/92/73292/1
diff --git a/include/platform/pci.h b/include/platform/pci.h index 93bc163..a0324f8 100644 --- a/include/platform/pci.h +++ b/include/platform/pci.h @@ -14,12 +14,16 @@ */ #define index shadow_workaround_index
-#if defined (__NetBSD__) -#include <pci.h> +/* Some NetBSDs are using an other include path for pci.h + * e.g. NetBSD 9.0 on sparc64 pciutils-3.7.0nb2. + * Other NetBSD platforms and versions uses the default path under pci/pci.h + */ +#if __has_include(<pciutils/pci.h>) +#include <pciutils/pci.h> #else #include <pci/pci.h> #endif
#undef index
-#endif /* __PLATFORM_PCI_H__ */ \ No newline at end of file +#endif /* __PLATFORM_PCI_H__ */