openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Work around shadowing warnings in libpci headers

Browse Source 
This is needed for warning-free compilation on older gcc versions (3.x
and probably older). Such a gcc version is the default on i386 OpenBSD.

Corresponding to flashrom svn r1061.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stuart Henderson <sthen@openbsd.org>
This commit is contained in:
Carl-Daniel Hailfinger 2010-06-25 13:18:48 +00:00
parent 2bd007a97e
commit 7237683faf
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -310,7 +310,9 @@ compiler: featuresavailable
ifeq ($(CHECK_LIBPCI), yes)
pciutils: compiler
@printf "Checking for libpci headers... "
@$(shell ( echo "#include <pci/pci.h>"; \
@# Avoid a failing test due to libpci header symbol shadowing breakage
@$(shell ( echo "#define index shadow_workaround_index"; \
echo "#include <pci/pci.h>"; \
echo "struct pci_access *pacc;"; \
echo "int main(int argc, char **argv)"; \
echo "{ pacc = pci_alloc(); return 0; }"; ) > .test.c )

7
hwaccess.h
View File

@ -31,7 +31,14 @@
#endif
#if NEED_PCI == 1
/*
* libpci headers use the variable name "index" which triggers shadowing
* warnings on systems which have the index() function in a default #include
* or as builtin.
*/
#define index shadow_workaround_index
#include <pci/pci.h>
#undef index
#endif
#if defined (__i386__) || defined (__x86_64__)