[src/trunk]: src/external/cddl/osnet/sys/sys Define ptob only if it wasn't de...

[haad <haad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4d433a9fbac7
branches:  trunk
changeset: 748062:4d433a9fbac7
user:      haad <haad%NetBSD.org@localhost>
date:      Sun Oct 11 22:17:57 2009 +0000

description:
Define ptob only if it wasn't defined already in NetBSD headers.

diffstat:

 external/cddl/osnet/sys/sys/zfs_context.h |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 65fb73bee5c3 -r 4d433a9fbac7 external/cddl/osnet/sys/sys/zfs_context.h
--- a/external/cddl/osnet/sys/sys/zfs_context.h Sun Oct 11 20:37:47 2009 +0000
+++ b/external/cddl/osnet/sys/sys/zfs_context.h Sun Oct 11 22:17:57 2009 +0000
@@ -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)