Thomas Heijligen submitted this change.

View Change


Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved
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>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/73292
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
M include/platform/pci.h
1 file changed, 27 insertions(+), 3 deletions(-)

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

To view, visit change 73292. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ib20de6bffede910b89937f554b4d56f4799f0762
Gerrit-Change-Number: 73292
Gerrit-PatchSet: 3
Gerrit-Owner: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged