Renamed shm.h to shm_driver.h to avoid conflicts with POSIX shm.h.

Renamed file shmsupp/intr.c in some BSPs to shmsupp/cause_intr.c to
avoid conflict with rtems/src/intr.c (Classic API Interrupt Manager).

7 files changed, 7 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in b/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in
index c8eb097608..7734daacd6 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in
@@ -16,7 +16,7 @@ VPATH = @srcdir@
 PGM = ${ARCH}/shmsupp.rel
 
 # C source names, if any, go here -- minus the .c
-C_PIECES = addrconv getcfg intr lock mpisr
+C_PIECES = addrconv getcfg cause_intr lock mpisr
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c b/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c
index 120ec7eccf..a3d4a8ff49 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c
@@ -19,7 +19,7 @@
  */
 
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 void *Shm_Convert_address(
   void *addr
diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/intr.c b/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c
index 6baf56201d..39e98c96b0 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/intr.c
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c
@@ -19,7 +19,7 @@
  */
 
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 #include <sys/types.h>      /* pid_t */
 
 void Shm_Cause_interrupt_unix(
diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c b/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c
index 03477883e0..bc0d1c279d 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c
@@ -25,7 +25,7 @@
  */
 
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 #include <sys/types.h>    /* pid_t */
 
 shm_config_table BSP_shm_cfgtbl;
diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/lock.c b/c/src/lib/libbsp/unix/posix/shmsupp/lock.c
index 00e9c6f3d9..dc3a61df5f 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/lock.c
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/lock.c
@@ -17,7 +17,7 @@
  */
 
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 /*
  *  Shm_Initialize_lock
diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c b/c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c
index a6e892863c..3838cdb98f 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/mpisr.c
@@ -18,7 +18,7 @@
  */
 
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 void Shm_setvec( void )
 {
diff --git a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in
index 5f3f83cec2..f0260c8036 100644
--- a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in
@@ -27,7 +27,7 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES)
 CPU_PIECES =
 
 GENERIC_MP_REL_PIECES_yes_V = shmdr
-GENERIC_MP_REL_PIECES = $(GENERIC_MP_REL_$(HAS_MP)_V)
+GENERIC_MP_REL_PIECES = $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
 GENERIC_PIECES = $(GENERIC_MP_REL_PIECES)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x