[PATCH 02/34] m68k/mrm332: Move include of <rtems/m68k/sim.h>

Joel Sherrill joel.sherrill at oarcorp.com
Mon Oct 20 20:34:04 UTC 2014


This file defines at least the POW() macro which pollutes the
public name space and causes warnings in at least the paranoia
sample application.
---
 c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c | 1 +
 c/src/lib/libbsp/m68k/mrm332/include/bsp.h  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
index b650275..718301b 100644
--- a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <bsp.h>
 #include <mrm332.h>
+#include <rtems/m68k/sim.h>
 
 #define CLOCK_VECTOR   MRM_PIV
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
index 721e45e..15549a4 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
@@ -28,7 +28,6 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/iosupp.h>
 #include <mrm332.h>
-#include <rtems/m68k/sim.h>
 
 #define CONSOLE_SCI
 
-- 
1.9.3




More information about the devel mailing list