Avoid 'static __inline' on HPUX

'static __inline' functions on HPUX can segfault the /opt/ansic compiler
(unless we lose debugging symbols). So, just use 'static' for those
functions on HPUX. Also revert a9368a6c3dfe4435ec2ae63fff4a3325104ed9f7,
so we get a static inline function on other platforms.

Reviewed-on: http://gerrit.openafs.org/691
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c
index 160c244c51825b686ee1f8dad498d73088cec6ad..3016af3c930e1abe95bc0d830f68cac23c2c3504 100644 (file)
--- a/src/bozo/fsbnodeops.c
+++ b/src/bozo/fsbnodeops.c
@@ -158,10 +158,8 @@ struct bnode_ops dafsbnode_ops = {
  * dropping type information
  */
 
-#ifndef AFS_HPUX_ENV
-static_inline 
-#endif
-struct bnode * fsbnode2bnode(struct fsbnode *abnode) {
+static_inline struct bnode *
+fsbnode2bnode(struct fsbnode *abnode) {
     return (struct bnode *) abnode;
 }
 

diff --git a/src/config/stds.h b/src/config/stds.h
index f1ff418eca31e7c9ae61bc1164411825cfdf9770..6dfee1278074b113f30704da6291d89bb73da80a 100644 (file)
--- a/src/config/stds.h
+++ b/src/config/stds.h
@@ -304,8 +304,10 @@ typedef struct afsUUID afsUUID;
 #define static_inline __inline static
 #define hdr_static_inline(x) __inline static x
 #elif defined(AFS_HPUX_ENV) || defined(AFS_USR_HPUX_ENV)
-#define static_inline static __inline
-#define hdr_static_inline(x) static __inline x
+/* The HPUX compiler can segfault on 'static __inline', so fall back to
+ * just 'static' so we can at least compile */
+#define static_inline static
+#define hdr_static_inline(x) static x
 #elif defined(AFS_AIX_ENV) || defined(AFS_USR_AIX_ENV)
 #define static_inline static
 #define hdr_static_inline(x) static x