From: Tom Keiser <tkeiser@sinenomine.net>
Date: Fri, 14 Mar 2008 04:42:52 +0000 (+0000)
Subject: DEVEL15-vol-dafs-aix-fixes-20080313
X-Git-Tag: openafs-devel-1_5_34~30
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a1ebc6cc31dffceeb099459053756e34dbfb8187;p=packages%2Fo%2Fopenafs.git

DEVEL15-vol-dafs-aix-fixes-20080313

LICENSE IPL10
FIXES 88087

* xlc doesn't support the inline keyword unless C99 is enabled
* xlc won't parse enumerations with trailing commas


(cherry picked from commit 53a57b79b567aed990eb27d0b4a24109a65a993e)
---

diff --git a/src/vol/daemon_com.h b/src/vol/daemon_com.h
index ac29ed76c..41ec3cae5 100644
--- a/src/vol/daemon_com.h
+++ b/src/vol/daemon_com.h
@@ -27,6 +27,7 @@
  */
 enum SYNCOpCode {
     SYNC_COM_CHANNEL_CLOSE    = 0,      /**< request sync channel shutdown */
+    SYNC_OP_CODE_END
 };
 
 
@@ -47,6 +48,7 @@ enum SYNCReasonCode {
     SYNC_COM_ERROR            = 2,  /**< sync protocol communicaions error */
     SYNC_BAD_COMMAND          = 3,  /**< sync command code not implemented by server */
     SYNC_FAILED               = 4,  /**< sync server-side procedure failed */
+    SYNC_REASON_CODE_END
 };
 
 /* SYNC protocol reason codes
diff --git a/src/vol/fssync.h b/src/vol/fssync.h
index 3bba7947b..b506b883e 100644
--- a/src/vol/fssync.h
+++ b/src/vol/fssync.h
@@ -50,6 +50,7 @@ enum FSYNCOpCode {
     FSYNC_VOL_FORCE_ERROR     = SYNC_COM_CODE_DECL(16), /**< force volume into error state */
     FSYNC_VOL_LEAVE_OFF       = SYNC_COM_CODE_DECL(17), /**< end vol op, but leave volume offline */
     FSYNC_VOL_QUERY_VNODE     = SYNC_COM_CODE_DECL(18), /**< query vnode state */
+    FSYNC_OP_CODE_END
 };
 
 /**
@@ -66,6 +67,7 @@ enum FSYNCReasonCode {
     FSYNC_NO_PENDING_VOL_OP   = SYNC_REASON_CODE_DECL(7), /**< no volume operation pending */
     FSYNC_VOL_PKG_ERROR       = SYNC_REASON_CODE_DECL(8), /**< error in the volume package */
     FSYNC_UNKNOWN_VNID        = SYNC_REASON_CODE_DECL(9), /**< vnode id not known by fileserver */
+    FSYNC_REASON_CODE_END
 };
 
 /* FSYNC response codes */
diff --git a/src/vol/vnode.h b/src/vol/vnode.h
index 1eaf00638..1c5e014b5 100644
--- a/src/vol/vnode.h
+++ b/src/vol/vnode.h
@@ -155,6 +155,7 @@ enum VnFlags {
     VN_ON_HASH            = 0x1,        /**< vnode is on hash table */
     VN_ON_LRU             = 0x2,        /**< vnode is on lru list */
     VN_ON_VVN             = 0x4,        /**< vnode is on volume vnode list */
+    VN_FLAGS_END
 };
 
 
diff --git a/src/vol/vnode_inline.h b/src/vol/vnode_inline.h
index 07d2786b1..d38a74d03 100644
--- a/src/vol/vnode_inline.h
+++ b/src/vol/vnode_inline.h
@@ -15,7 +15,7 @@
 #ifdef AFS_HPUX_ENV
 #define static_inline static __inline
 #elif defined(AFS_AIX_ENV)
-#define static_inline inline
+#define static_inline static
 #else
 #define static_inline static inline
 #endif
diff --git a/src/vol/volume_inline.h b/src/vol/volume_inline.h
index cb3ca323e..8a75fc60a 100644
--- a/src/vol/volume_inline.h
+++ b/src/vol/volume_inline.h
@@ -15,7 +15,7 @@
 #ifdef AFS_HPUX_ENV
 #define static_inline static __inline
 #elif defined(AFS_AIX_ENV)
-#define static_inline inline
+#define static_inline static
 #else
 #define static_inline static inline
 #endif