diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-06-29 11:31:09 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-07-12 16:19:16 +0200 |
| commit | 20668fdebdbb718238c7e80febd0249b5691c99f (patch) | |
| tree | dd8ad4fcd085d8e5822cb8e0a682f4b12c883436 | |
| parent | 14e54f8ecfe9c5e17348f456781344737ed10b3b (diff) | |
| download | focaccia-qemu-20668fdebdbb718238c7e80febd0249b5691c99f.tar.gz focaccia-qemu-20668fdebdbb718238c7e80febd0249b5691c99f.zip | |
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 <armbru@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | include/hw/pci-host/spapr.h | 4 |
1 files changed, 1 insertions, 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 <http://www.gnu.org/licenses/>. */ -#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" |