From 624c5d09e2f46403f8754567b387987488c5446c Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Wed, 14 Sep 2011 10:48:08 -0400 Subject: [PATCH] solaris: fix afs_event build error Fix build error on solaris introduced with commit dc077b83c9b1f107efbc3483743f44117748f23c. Change-Id: Id41a0d7cf6400769dde5d2626854e2190cd6bd2e Reviewed-on: http://gerrit.openafs.org/5419 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/afs/afs.h | 2 +- src/afs/afs_osi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/afs/afs.h b/src/afs/afs.h index 8b2badf..ca5509a 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -1584,7 +1584,7 @@ typedef struct afs_event { int cond; /* "all this gluck should probably be replaced by CVs" */ #elif defined(AFS_LINUX24_ENV) wait_queue_head_t cond; -#elif defined(AFS_NBSD_ENV) || defined(AFS_SOLARIS_ENV) || defined(AFS_SGI_ENV) +#elif defined(AFS_NBSD_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) kcondvar_t cond; /* Currently associated condition variable */ #endif } afs_event_t; diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c index b446e8b..95579c1 100644 --- a/src/afs/afs_osi.c +++ b/src/afs/afs_osi.c @@ -299,7 +299,7 @@ shutdown_osisleep(void) xmfree(tmp); #elif defined(AFS_FBSD_ENV) afs_osi_Free(tmp, sizeof(*tmp)); -#elif defined(AFS_SGI_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_SOLARIS_ENV) +#elif defined(AFS_SGI_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_SUN5_ENV) osi_FreeSmallSpace(tmp); #elif defined(AFS_LINUX26_ENV) kfree(tmp); -- 1.9.4