From 000c98dbaad769971f8874ff977e6462a7bb3bf7 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Tue, 25 May 2010 13:58:50 +0100
Subject: [PATCH] [PATCH 08/12] fix includes

---
 src/libCom/osi/devLibVME.c                | 4 ++--
 src/libCom/osi/devLibVME.h                | 3 ++-
 src/libCom/osi/os/RTEMS/devLibVMEOSD.c    | 2 +-
 src/libCom/osi/os/cygwin32/devLibVMEOSD.c | 2 +-
 src/libCom/osi/os/default/devLibVMEOSD.c  | 2 +-
 src/libCom/osi/os/vxWorks/devLibVMEOSD.c  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/libCom/osi/devLibVME.c b/src/libCom/osi/devLibVME.c
index 5a4965380..53f55dd99 100644
--- a/src/libCom/osi/devLibVME.c
+++ b/src/libCom/osi/devLibVME.c
@@ -31,8 +31,8 @@ static const char sccsID[] = "@(#) devLib.c,v 1.1.2.11 2009/07/09 16:37:23 anj E
 #include "ellLib.h"
 
 #define NO_DEVLIB_COMPAT
-#include "devLib.h"
-#include "devLibImpl.h"
+#include "devLibVME.h"
+#include "devLibVMEImpl.h"
 
 static ELLLIST addrAlloc[atLast];
 static ELLLIST addrFree[atLast];
diff --git a/src/libCom/osi/devLibVME.h b/src/libCom/osi/devLibVME.h
index 85347f81f..847949d07 100644
--- a/src/libCom/osi/devLibVME.h
+++ b/src/libCom/osi/devLibVME.h
@@ -22,6 +22,7 @@
 #include "osdVME.h"
 #include "errMdef.h"
 #include "shareLib.h"
+#include "devLib.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,7 +55,7 @@ epicsShareExtern const char *epicsAddressTypeName[];
  * To retain compatibility include everything by default
  */
 #ifndef NO_DEVLIB_COMPAT
-#  include  "devLibImpl.h"
+#  include  "devLibVMEImpl.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libCom/osi/os/RTEMS/devLibVMEOSD.c b/src/libCom/osi/os/RTEMS/devLibVMEOSD.c
index 2abb3de38..20b81bc3a 100644
--- a/src/libCom/osi/os/RTEMS/devLibVMEOSD.c
+++ b/src/libCom/osi/os/RTEMS/devLibVMEOSD.c
@@ -17,7 +17,7 @@
 #include <epicsExit.h>
 #include <rtems.h>
 #include <bsp.h>
-#include "devLib.h"
+#include "devLibVME.h"
 #include <epicsInterrupt.h>
 
 #if defined(__PPC__) || defined(__mcf528x__)
diff --git a/src/libCom/osi/os/cygwin32/devLibVMEOSD.c b/src/libCom/osi/os/cygwin32/devLibVMEOSD.c
index 90844de61..9192eac8b 100644
--- a/src/libCom/osi/os/cygwin32/devLibVMEOSD.c
+++ b/src/libCom/osi/os/cygwin32/devLibVMEOSD.c
@@ -10,6 +10,6 @@
 #include <stdlib.h>
 
 #define epicsExportSharedSymbols
-#include "devLib.h"
+#include "devLibVME.h"
 
 epicsShareDef devLibVirtualOS *pdevLibVirtualOS = NULL;
diff --git a/src/libCom/osi/os/default/devLibVMEOSD.c b/src/libCom/osi/os/default/devLibVMEOSD.c
index 064f1e7d6..e373325a8 100644
--- a/src/libCom/osi/os/default/devLibVMEOSD.c
+++ b/src/libCom/osi/os/default/devLibVMEOSD.c
@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "devLib.h"
+#include "devLibVME.h"
 
 /* This file must contain no definitions other than the following: */
 
diff --git a/src/libCom/osi/os/vxWorks/devLibVMEOSD.c b/src/libCom/osi/os/vxWorks/devLibVMEOSD.c
index 6bf6fbd66..7ce0ce663 100644
--- a/src/libCom/osi/os/vxWorks/devLibVMEOSD.c
+++ b/src/libCom/osi/os/vxWorks/devLibVMEOSD.c
@@ -28,7 +28,7 @@
 #include <vxLib.h>
 
 #include "epicsFindSymbol.h"
-#include "devLib.h"
+#include "devLibVME.h"
 #include "errlog.h"
 
 typedef void    myISR (void *pParam);