[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/18] spapr_pci: Include spapr.h instead of playing
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 11/18] spapr_pci: Include spapr.h instead of playing games with #error |
Date: |
Tue, 12 Jul 2016 16:31:27 +0200 |
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 <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
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 193631d..7b63243 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"
--
2.5.5
- [Qemu-devel] [PULL 00/18] Clean up #include "..." vs <...> and header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 07/18] linux-user: Clean up target_structs.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 02/18] scripts: New clean-header-guards.pl, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 14/18] libdecnumber: Don't fool around with guards to avoid #include, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 08/18] linux-user: Clean up hostdep.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 18/18] cris: Fix broken header guard in hw/cris/boot.h, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 04/18] linux-user: Clean up target_syscall.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 11/18] spapr_pci: Include spapr.h instead of playing games with #error,
Markus Armbruster <=
- [Qemu-devel] [PULL 10/18] tcg: Clean up tcg-target.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 12/18] Drop Emacs local variables lists redundant with .dir-locals.el, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 09/18] linux-user: Fix broken header guard in syscall_defs.h, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 03/18] target-*: Clean up cpu.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 06/18] linux-user: Clean up target_signal.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 15/18] libdecnumber: Don't error out on decNumberLocal.h re-inclusion, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 01/18] Use #include "..." for our own headers, <...> for others, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 05/18] linux-user: Clean up target_cpu.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 13/18] Clean up header guards that don't match their file name, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 17/18] Clean up decorations and whitespace around header guards, Markus Armbruster, 2016/07/12