track name changes

This commit is contained in:
Jeff Hill
2011-08-05 09:51:05 -06:00
committed by Andrew Johnson
parent 747a59fd7f
commit cedcddd0e8
5 changed files with 20 additions and 20 deletions

View File

@@ -13,8 +13,8 @@
* johill@lanl.gov
*/
#ifndef cdAtomic_h
#define cdAtomic_h
#ifndef epicsAtomicCD_h
#define epicsAtomicCD_h
#if defined ( __cplusplus )
# define OSD_ATOMIC_INLINE inline
@@ -22,6 +22,6 @@
# define OSD_ATOMIC_INLINE __inline__
#endif
#include "osdAtomic.h"
#include "epicsAtomicOSD.h"
#endif /* cdAtomic_h */
#endif /* epicsAtomicCD_h */

View File

@@ -13,13 +13,13 @@
* johill@lanl.gov
*/
#ifndef cdAtomic_h
#define cdAtomic_h
#ifndef epicsAtomicCD_h
#define epicsAtomicCD_h
#if __STDC_VERSION__ >= 199901L || defined ( __cplusplus )
# define OSD_ATOMIC_INLINE inline
#endif
#include "osdAtomic.h"
#include "epicsAtomicOSD.h"
#endif /* cdAtomic_h */
#endif /* epicsAtomicCD_h */

View File

@@ -13,8 +13,8 @@
* johill@lanl.gov
*/
#ifndef cdAtomic_h
#define cdAtomic_h
#ifndef epicsAtomicCD_h
#define epicsAtomicCD_h
#ifndef __GNUC__
# error this header is only for use with the gnu compiler
@@ -90,8 +90,8 @@ OSD_ATOMIC_INLINE unsigned epicsAtomicTestAndSetUIntT ( unsigned * pTarget )
* not available as gcc intrinsics so we
* will employ an os specific inline solution
*/
# include "osdAtomic.h"
# include "epicsAtomicOSD.h"
#endif /* if GCC_ATOMIC_INTRINSICS_AVAIL */
#endif /* cdAtomic_h */
#endif /* epicsAtomicCD_h */

View File

@@ -13,8 +13,8 @@
* johill@lanl.gov
*/
#ifndef cdAtomic_h
#define cdAtomic_h
#ifndef epicsAtomicCD_h
#define epicsAtomicCD_h
#include "epicsAssert.h"
@@ -157,9 +157,9 @@ OSD_ATOMIC_INLINE size_t epicsAtomicGetSizeT ( const size_t * pTarget )
#if defined ( __cplusplus )
# define OSD_ATOMIC_INLINE inline
# include "osdAtomic.h"
# include "epicsAtomicOSD.h"
#endif
#endif /* ifdef _MSC_EXTENSIONS */
#endif /* cdAtomic_h */
#endif /* epicsAtomicCD_h */

View File

@@ -13,8 +13,8 @@
* johill@lanl.gov
*/
#ifndef cdAtomic_h
#define cdAtomic_h
#ifndef epicsAtomicCD_h
#define epicsAtomicCD_h
#if defined ( __cplusplus )
# define OSD_ATOMIC_INLINE inline
@@ -22,6 +22,6 @@
# define OSD_ATOMIC_INLINE __inline
#endif
#include "osdAtomic.h"
#include "epicsAtomicOSD.h"
#endif /* cdAtomic_h */
#endif /* epicsAtomicCD_h */