From 3bae2a470fb7bfff156b23f3b8da8f8c19d57e4c Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 30 Aug 2011 14:46:24 -0600 Subject: [PATCH] fixed names on redefinition protection macros for vxWorks --- src/libCom/osi/os/vxWorks/epicsAtomicOSD.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libCom/osi/os/vxWorks/epicsAtomicOSD.h b/src/libCom/osi/os/vxWorks/epicsAtomicOSD.h index c616481e0..c52d991b0 100644 --- a/src/libCom/osi/os/vxWorks/epicsAtomicOSD.h +++ b/src/libCom/osi/os/vxWorks/epicsAtomicOSD.h @@ -33,16 +33,16 @@ extern "C" { #endif /* __cplusplus */ -#ifndef EPICS_READ_MEMORY_BARRIER -#define EPICS_READ_MEMORY_BARRIER +#ifndef EPICS_ATOMIC_READ_MEMORY_BARRIER +#define EPICS_ATOMIC_READ_MEMORY_BARRIER EPICS_ATOMIC_INLINE void epicsAtomicReadMemoryBarrier () { VX_MEM_BARRIER_R (); } #endif -#ifndef EPICS_WRITE_MEMORY_BARRIER -#define EPICS_WRITE_MEMORY_BARRIER +#ifndef EPICS_ATOMIC_WRITE_MEMORY_BARRIER +#define EPICS_ATOMIC_WRITE_MEMORY_BARRIER EPICS_ATOMIC_INLINE void epicsAtomicWriteMemoryBarrier () { VX_MEM_BARRIER_W (); @@ -223,8 +223,8 @@ EPICS_ATOMIC_INLINE void epicsAtomicUnlock ( EpicsAtomicLockKey * pKey ) } #endif -#ifndef EPICS_READ_MEMORY_BARRIER -#define EPICS_READ_MEMORY_BARRIER +#ifndef EPICS_ATOMIC_READ_MEMORY_BARRIER +#define EPICS_ATOMIC_READ_MEMORY_BARRIER /* * no need for memory barrior since prior to vxWorks 6.6 it is a single cpu system * (we are not protecting against multiple access to memory mapped IO) @@ -232,8 +232,8 @@ EPICS_ATOMIC_INLINE void epicsAtomicUnlock ( EpicsAtomicLockKey * pKey ) EPICS_ATOMIC_INLINE void epicsAtomicReadMemoryBarrier () {} #endif -#ifndef EPICS_WRITE_MEMORY_BARRIER -#define EPICS_WRITE_MEMORY_BARRIER +#ifndef EPICS_ATOMIC_WRITE_MEMORY_BARRIER +#define EPICS_ATOMIC_WRITE_MEMORY_BARRIER /* * no need for memory barrior since prior to vxWorks 6.6 it is a single cpu system * (we are not protecting against multiple access to memory mapped IO)