summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-04-12 15:21:21 -0400
committer AJR <ajrhacker@users.noreply.github.com>2017-04-12 15:21:21 -0400
commit2d8b67697fc23ca5ba600e14aaac18333e86ae06 (patch)
treeb475b005628f5f51ec57479eef9784b1d0be9414
parent0f510928f83ba4a2a0dbc285685df36376ee9dac (diff)
m68000, i386: Workaround for multiple inclusion until SoftFloat is updated to version 3 (nw)
-rw-r--r--src/devices/cpu/i386/i386.h5
-rw-r--r--src/devices/cpu/m68000/m68000.h5
2 files changed, 9 insertions, 1 deletions
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 */