DEVEL15-generic-inline-20080924

LICENSE IPL10

move static_inline macro to generic location

(cherry picked from commit af4d05c3a44d5b51dd6ae48e79c135af7efc530f)

diff --git a/src/config/stds.h b/src/config/stds.h
index 62d64db6b233f2d900bf53aa5d7bb2c8698c2a21..176be3bc199024ea25d690c6d2efc07b772e7088 100644 (file)
--- 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 1cfdf980f0803c0b601c6537465457bb72379257..e7cdefb3e69fb607f77d4ee94816eee5b0e2690a 100644 (file)
--- 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 89f40a6b9b6a045616256dd4cb946fca94d3dd57..4883b43cb28dfe880ee5ce0453b61f1b7f2c9235 100644 (file)
--- 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         */
 /***************************************************/