From 87af0e4cb603218417a04e203b5182929f7c5a0e Mon Sep 17 00:00:00 2001 From: Chaz Chandler Date: Mon, 8 Feb 2010 21:42:35 -0500 Subject: [PATCH] fix AFS_ASSERT_GLOCK on irix and aix irix and aix do not have a vararg version of osi_Panic, fixed AFS_ASSERT_GLOCK macro definition in afs/afs_osi.h for those two platforms Change-Id: I0b541d2c1edad1364ef1c91dec84b9d4319c4e62 modified: src/afs/afs_osi.h Reviewed-on: http://gerrit.openafs.org/1267 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/afs_osi.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h index 805b2b144..04bf1f730 100644 --- a/src/afs/afs_osi.h +++ b/src/afs/afs_osi.h @@ -197,8 +197,13 @@ typedef struct timeval osi_timeval_t; #ifdef AFS_GLOBAL_SUNLOCK +# if defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) +#define AFS_ASSERT_GLOCK() \ + do { if (!ISAFS_GLOCK()) osi_Panic("afs global lock not held at %s:%d%s\n", __FILE__, (void *)__LINE__, ""); } while (0) +# else #define AFS_ASSERT_GLOCK() \ do { if (!ISAFS_GLOCK()) osi_Panic("afs global lock not held at %s:%d\n", __FILE__, __LINE__); } while (0) +# endif /* defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) */ #endif /* AFS_GLOBAL_SUNLOCK */ #ifdef RX_ENABLE_LOCKS -- 2.39.5