Module Name: src
Committed By: haad
Date: Sun Oct 11 22:17:57 UTC 2009
Modified Files:
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
Define ptob only if it wasn't defined already in NetBSD headers.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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.3 src/external/cddl/osnet/sys/sys/zfs_context.h:1.4
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.3 Sun Oct 11 10:56:13 2009
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Sun Oct 11 22:17:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zfs_context.h,v 1.3 2009/10/11 10:56:13 haad Exp $ */
+/* $NetBSD: zfs_context.h,v 1.4 2009/10/11 22:17:57 haad Exp $ */
/*
* CDDL HEADER START
@@ -499,8 +499,7 @@
#define ERESTART (-1)
#endif
-#ifdef ptob
-#undef ptob
+#ifndef ptob
size_t ptob(size_t);
#endif
@@ -614,8 +613,7 @@
#define issig(x) (sigispending(curlwp, 0))
#define ISSIG(thr, why) (sigispending(thr, 0))
#define fm_panic panic
-#ifdef ptob
-#undef ptob
+#ifndef ptob
#define ptob(x) ((x) * PAGE_SIZE)
#endif /* ptob */
#define strncat(a, b, c) strlcat(a, b, c)
