Module Name: src
Committed By: haad
Date: Sun Oct 11 10:56:13 UTC 2009
Modified Files:
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
undef ptob if it was already defined/included in some NetBSD header file.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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.2 src/external/cddl/osnet/sys/sys/zfs_context.h:1.3
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.2 Wed Oct 7 08:47:12 2009
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Sun Oct 11 10:56:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zfs_context.h,v 1.2 2009/10/07 08:47:12 haad Exp $ */
+/* $NetBSD: zfs_context.h,v 1.3 2009/10/11 10:56:13 haad Exp $ */
/*
* CDDL HEADER START
@@ -614,7 +614,10 @@
#define issig(x) (sigispending(curlwp, 0))
#define ISSIG(thr, why) (sigispending(thr, 0))
#define fm_panic panic
+#ifdef ptob
+#undef ptob
#define ptob(x) ((x) * PAGE_SIZE)
+#endif /* ptob */
#define strncat(a, b, c) strlcat(a, b, c)
#define tsd_get(x) lwp_getspecific(x)
#define tsd_set(x, y) (lwp_setspecific(x, y), 0)
