From 20668fdebdbb718238c7e80febd0249b5691c99f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 11:31:09 +0200 Subject: spapr_pci: Include spapr.h instead of playing games with #error include/hw/pci-host/spapr.h needs hw/ppc/spapr.h. It checks whether its header guard is defined, and errors out if it isn't. Playing games with some other header's guard symbol is not a good idea. Just include the frackin' header already. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- include/hw/pci-host/spapr.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index 193631d2dc..7b63243ffb 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -16,13 +16,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#if !defined(__HW_SPAPR_H__) -#error Please include spapr.h before this file! -#endif #if !defined(__HW_SPAPR_PCI_H__) #define __HW_SPAPR_PCI_H__ +#include "hw/ppc/spapr.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/ppc/xics.h" -- cgit v1.2.3