From 48bfd9925727e46aada26c40c967a5ad57d98919 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 30 Nov 1999 19:58:02 +0000
Subject: 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).
---
 c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c | 2 +-
 c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c   | 2 +-
 c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c     | 2 +-
 c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/mpisr.c    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'c/src/lib/libbsp/no_cpu')

diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c
index 9b000cc082..d8a283c87a 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/addrconv.c
@@ -20,7 +20,7 @@
 
 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 void *Shm_Convert_address(
   void *address
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c
index c044315af4..74ad7cee46 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c
@@ -33,7 +33,7 @@ XXX: FIX THE COMMENTS BELOW WHEN THE CPU IS KNOWN
 
 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 /*
  *  configured if currently polling of interrupt driven
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
index 6cfd2a015a..81d424a39e 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
@@ -18,7 +18,7 @@
 
 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 /*
  *  Shm_Initialize_lock
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/mpisr.c b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/mpisr.c
index cfe3dfa267..8d7054b8da 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/mpisr.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/mpisr.c
@@ -12,7 +12,7 @@
 
 #include <rtems.h>
 #include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
 
 rtems_isr Shm_isr_nobsp( void )
 {
-- 
cgit v1.2.3