From: Ben Kaduk Date: Tue, 26 Oct 2010 04:17:11 +0000 (-0400) Subject: Complete change from dcb40c9fb8 for FBSD X-Git-Tag: upstream/1.8.0_pre1^2~4625 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f70d9181d33960856fed4bae23008a450c932f3d;p=packages%2Fo%2Fopenafs.git Complete change from dcb40c9fb8 for FBSD Many conditionals involving osi_fsplock were changed to depend on AFS_PRIVATE_OSI_ALLOCSPACES instead of constants or other things (like AFS_FBSD_ENV). The condition on the initializaion in afs_init was changed but not the declaration in afs_prototypes.h, breaking the build on FBSD. Use the same conditional in afs_prototypes.h, fixing the FBSD build. Change-Id: I28d5d3be4f1b2fdb8aca0834df7d8fc65f0d0146 Reviewed-on: http://gerrit.openafs.org/3146 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index 1993679a2..c99beaaf7 100644 --- a/src/afs/afs_prototypes.h +++ b/src/afs/afs_prototypes.h @@ -550,7 +550,7 @@ extern const afs_ucred_t *afs_osi_proc2cred(afs_proc_t * pr); #endif /* afs_osi_alloc.c */ -#ifndef AFS_FBSD_ENV +#ifndef AFS_PRIVATE_OSI_ALLOCSPACES extern afs_lock_t osi_fsplock; extern afs_lock_t osi_flplock; #endif