From a9d3f2c081793fb86cbea2a8ba8e8ad1c4301deb Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 24 Sep 2008 22:34:33 +0000 Subject: [PATCH] DEVEL15-generic-inline-20080924 LICENSE IPL10 move static_inline macro to generic location (cherry picked from commit af4d05c3a44d5b51dd6ae48e79c135af7efc530f) --- src/config/stds.h | 8 ++++++++ src/vol/vnode_inline.h | 8 -------- src/vol/volume_inline.h | 9 --------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/config/stds.h b/src/config/stds.h index 62d64db6b..176be3bc1 100644 --- a/src/config/stds.h +++ b/src/config/stds.h @@ -276,4 +276,12 @@ typedef struct afsUUID afsUUID; #define AFS_DEMAND_ATTACH_FS 1 #endif +#ifdef AFS_HPUX_ENV +#define static_inline static __inline +#elif defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) +#define static_inline static +#else +#define static_inline static inline +#endif + #endif /* OPENAFS_CONFIG_AFS_STDS_H */ diff --git a/src/vol/vnode_inline.h b/src/vol/vnode_inline.h index 1cfdf980f..e7cdefb3e 100644 --- a/src/vol/vnode_inline.h +++ b/src/vol/vnode_inline.h @@ -12,14 +12,6 @@ #include "vnode.h" -#ifdef AFS_HPUX_ENV -#define static_inline static __inline -#elif defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) -#define static_inline static -#else -#define static_inline static inline -#endif - /***************************************************/ /* demand attach vnode state machine routines */ /***************************************************/ diff --git a/src/vol/volume_inline.h b/src/vol/volume_inline.h index 89f40a6b9..4883b43cb 100644 --- a/src/vol/volume_inline.h +++ b/src/vol/volume_inline.h @@ -12,15 +12,6 @@ #include "volume.h" -#ifdef AFS_HPUX_ENV -#define static_inline static __inline -#elif defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) -#define static_inline static -#else -#define static_inline static inline -#endif - - /***************************************************/ /* demand attach fs state machine routines */ /***************************************************/ -- 2.39.5