From f9a0c82a63e1aace9f2da7d7878ac7ee29cbc2f5 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 28 Mar 2013 17:17:41 -0500
Subject: [PATCH] libCom/osi: Resolve bcopyLongs() conflict on vxWorks 6.9

---
 documentation/RELEASE_NOTES.html | 8 ++++++++
 src/libCom/osi/devLibVME.h       | 5 -----
 src/libCom/osi/os/RTEMS/osdVME.h | 2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index f62a502c7..7632b4c81 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -13,6 +13,14 @@
 
 <!-- Insert new items immediately below here ... -->
 
+<h4>devLibVME.h</h4>
+
+<p>Moved the declaration of bcopyLongs() from this header into RTEMS/osdVME.h.
+Its original location broke the build for vxWorks 6.9 (the int nlongs argument
+becomes size_t in 6.9, thus conflicting with this declaration). The only local
+implementation of this routine is found in RTEMS/devLibVMEOSD.c, but it is not
+used anywhere in Base.</p>
+
 <h4>Allow empty database files</h4>
 
 <p>The IOC used to report an error if dbLoadRecords or dbLoadDatabase was asked
diff --git a/src/libCom/osi/devLibVME.h b/src/libCom/osi/devLibVME.h
index 6d7476098..8e526a139 100644
--- a/src/libCom/osi/devLibVME.h
+++ b/src/libCom/osi/devLibVME.h
@@ -300,11 +300,6 @@ epicsShareFunc long locationProbe (epicsAddressType addrType, char *pLocation);
 
 #endif /* NO_DEVLIB_OLD_INTERFACE */
 
-/*
- * Some vxWorks convenience routines
- */
-void bcopyLongs(char *source, char *destination, int nlongs);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libCom/osi/os/RTEMS/osdVME.h b/src/libCom/osi/os/RTEMS/osdVME.h
index 470f64866..5e8c5f984 100644
--- a/src/libCom/osi/os/RTEMS/osdVME.h
+++ b/src/libCom/osi/os/RTEMS/osdVME.h
@@ -19,3 +19,5 @@
 #endif
 #endif
 #endif
+
+void bcopyLongs(char *source, char *destination, int nlongs);