From aa769ee7158193006139cb83ea2dca8bbb7436be Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Wed, 4 Oct 2000 19:34:23 +0000
Subject: [PATCH] semBinaryGive, semBinaryTake, semMutexGive, semMutexTake are
 now macros

---
 src/libCom/osi/os/vxWorks/osdSem.c | 24 ------------------------
 src/libCom/osi/os/vxWorks/osdSem.h | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/libCom/osi/os/vxWorks/osdSem.c b/src/libCom/osi/os/vxWorks/osdSem.c
index 255810086..a00e44fc0 100644
--- a/src/libCom/osi/os/vxWorks/osdSem.c
+++ b/src/libCom/osi/os/vxWorks/osdSem.c
@@ -37,18 +37,6 @@ void semBinaryDestroy(semBinaryId id)
     semDelete((SEM_ID)id);
 }
 
-void semBinaryGive(semBinaryId id)
-{
-    semGive((SEM_ID)id);
-}
-
-semTakeStatus semBinaryTake(semBinaryId id)
-{
-    int status;
-    status = semTake((SEM_ID)id,WAIT_FOREVER);
-    return((status==OK ? semTakeOK : semTakeError));
-}
-
 semTakeStatus semBinaryTakeTimeout(
     semBinaryId id, double timeOut)
 {
@@ -94,18 +82,6 @@ void semMutexDestroy(semMutexId id)
     semDelete((SEM_ID)id);
 }
 
-void semMutexGive(semMutexId id)
-{
-    semGive((SEM_ID)id);
-}
-
-semTakeStatus semMutexTake(semMutexId id)
-{
-    int status;
-    status = semTake((SEM_ID)id,WAIT_FOREVER);
-    return((status==OK ? semTakeOK : semTakeError));
-}
-
 semTakeStatus semMutexTakeTimeout(
     semMutexId id, double timeOut)
 {
diff --git a/src/libCom/osi/os/vxWorks/osdSem.h b/src/libCom/osi/os/vxWorks/osdSem.h
index f287fbfbd..8216e4cac 100644
--- a/src/libCom/osi/os/vxWorks/osdSem.h
+++ b/src/libCom/osi/os/vxWorks/osdSem.h
@@ -8,4 +8,20 @@ described on the COPYRIGHT_UniversityOfChicago file included as part
 of this distribution.
 ****************************************************************************/
 
-/* no osdSem.h definitions are needed */
+#include <vxWorks.h>
+#include <semLib.h>
+
+/* If the macro is replaced by inline it is necessary to say
+   static __inline__
+   but then a warning message appears everywhere osdSem.h is included
+*/
+
+#define semBinaryGive(ID) semGive((SEM_ID)(ID))
+
+#define semBinaryTake(ID) \
+(semTake((SEM_ID)(ID),WAIT_FOREVER)==OK ? semTakeOK : semTakeError)
+
+#define semMutexGive(ID) semGive((SEM_ID)(ID))
+
+#define semMutexTake(ID) \
+(semTake((SEM_ID)(ID),WAIT_FOREVER)==OK ? semTakeOK : semTakeError)