From 2d8b67697fc23ca5ba600e14aaac18333e86ae06 Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 12 Apr 2017 15:21:21 -0400 Subject: m68000, i386: Workaround for multiple inclusion until SoftFloat is updated to version 3 (nw) --- src/devices/cpu/i386/i386.h | 5 +++++ src/devices/cpu/m68000/m68000.h | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index 85817a8afb4..6f2397a6f38 100644 --- a/src/devices/cpu/i386/i386.h +++ b/src/devices/cpu/i386/i386.h @@ -5,8 +5,13 @@ #ifndef __I386INTF_H__ #define __I386INTF_H__ +// SoftFloat 2 lacks an include guard +#ifndef softfloat_h +#define softfloat_h 1 #include "softfloat/milieu.h" #include "softfloat/softfloat.h" +#endif + #include "debug/debugcpu.h" #include "divtlb.h" diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 93b39448f6c..cf203e43ca1 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -7,9 +7,12 @@ - +// SoftFloat 2 lacks an include guard +#ifndef softfloat_h +#define softfloat_h 1 #include "softfloat/milieu.h" #include "softfloat/softfloat.h" +#endif /* MMU constants */ -- cgit v1.2.3