Module Name: src Committed By: haad Date: Wed Oct 7 08:47:12 UTC 2009
Modified Files: src/external/cddl/osnet/sys/sys: zfs_context.h Log Message: Use ptob function from zfs and not NetBSD one. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/zfs_context.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/sys/sys/zfs_context.h diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.1 src/external/cddl/osnet/sys/sys/zfs_context.h:1.2 --- src/external/cddl/osnet/sys/sys/zfs_context.h:1.1 Fri Aug 7 20:57:58 2009 +++ src/external/cddl/osnet/sys/sys/zfs_context.h Wed Oct 7 08:47:12 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: zfs_context.h,v 1.1 2009/08/07 20:57:58 haad Exp $ */ +/* $NetBSD: zfs_context.h,v 1.2 2009/10/07 08:47:12 haad Exp $ */ /* * CDDL HEADER START @@ -499,7 +499,10 @@ #define ERESTART (-1) #endif +#ifdef ptob +#undef ptob size_t ptob(size_t); +#endif typedef struct ksiddomain { uint_t kd_ref;