[OpenAFS-devel] New branch in CVS: openafs-stable-1_4_0-branch (tiger and byte range locks)

[Kyle Moffett]

--Apple-Mail-4-10168902
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed

On Oct 6, 2005, at 18:52:20, Derrick J Brashear wrote:
> cvs update. that's already fixed.

Not quite; the macros get redefined in the #else.  Please apply the  
following patch in addition to the one I sent earlier; combined they  
get past all the errors I've encountered so far:

--Apple-Mail-4-10168902
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="afsdiff2.patch"
Content-Disposition: attachment;
	filename=afsdiff2.patch

Index: src/afs/afs_osi.h
===================================================================
RCS file: /cvs/openafs/src/afs/afs_osi.h,v
retrieving revision 1.22.2.12
diff -u -r1.22.2.12 afs_osi.h
--- src/afs/afs_osi.h	6 Oct 2005 17:44:38 -0000	1.22.2.12
+++ src/afs/afs_osi.h	6 Oct 2005 23:25:02 -0000
@@ -130,7 +130,8 @@
 extern int afs_vfs_typenum;
 #define SetAfsVnode(vn)         /* nothing; done in getnewvnode() */
 #define IsAfsVnode(v) (vfs_typenum(vnode_mount((v))) == afs_vfs_typenum)
-#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_LINUX22_ENV)
+#else
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_LINUX22_ENV)
 #define vSetVfsp(vc, vfsp)      AFSTOV(vc)->v_mount = (vfsp)
 #define vSetType(vc, type)      AFSTOV(vc)->v_type = (type)
 #define vType(vc)               AFSTOV(vc)->v_type
@@ -139,8 +140,7 @@
 #define	vSetType(vc,type)   (vc)->v.v_type = (type)
 #define	vSetVfsp(vc,vfsp)   (vc)->v.v_vfsp = (vfsp)
 #endif
-
-#if (defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN80_ENV)) || defined(AFS_XBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 extern int (**afs_vnodeop_p) ();
 #define IsAfsVnode(v)      ((v)->v_op == afs_vnodeop_p)
 #define SetAfsVnode(v)     /* nothing; done in getnewvnode() */
@@ -149,6 +149,7 @@
 #define	IsAfsVnode(v)	    ((v)->v_op == afs_ops)
 #define	SetAfsVnode(v)	    (v)->v_op = afs_ops
 #endif
+#endif
 
 #ifdef AFS_SGI65_ENV
 #define	gop_lookupname(fnamep,segflg,followlink,compvpp) \


--Apple-Mail-4-10168902
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed


Cheers,
Kyle Moffett

--
There are two ways of constructing a software design. One way is to  
make it so simple that there are obviously no deficiencies. And the  
other way is to make it so complicated that there are no obvious  
deficiencies.  The first method is far more difficult.
   -- C.A.R. Hoare



--Apple-Mail-4-10168902--