[src/trunk]: src/external/cddl/osnet/sys/sys Finaly fix ptob problem. ptob wa...

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

details:   https://anonhg.NetBSD.org/src/rev/2964321f3cb3
branches:  trunk
changeset: 748069:2964321f3cb3
user:      haad <haad%NetBSD.org@localhost>
date:      Mon Oct 12 10:05:29 2009 +0000

description:
Finaly fix ptob problem. ptob was defined for amd64 and not for i386, and
NetBSD version of ptob is not compatible with Solaris one.

diffstat:

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

diffs (39 lines):

diff -r e2a34d4d8cdb -r 2964321f3cb3 external/cddl/osnet/sys/sys/zfs_context.h
--- a/external/cddl/osnet/sys/sys/zfs_context.h Mon Oct 12 09:33:34 2009 +0000
+++ b/external/cddl/osnet/sys/sys/zfs_context.h Mon Oct 12 10:05:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zfs_context.h,v 1.4 2009/10/11 22:17:57 haad Exp $     */
+/*     $NetBSD: zfs_context.h,v 1.5 2009/10/12 10:05:29 haad Exp $     */
 
 /*
  * CDDL HEADER START
@@ -499,9 +499,12 @@
 #define        ERESTART        (-1)
 #endif
 
-#ifndef ptob
+#ifdef ptob
+#undef ptob
+#endif
+
 size_t ptob(size_t);
-#endif
+
 
 typedef struct ksiddomain {
        uint_t  kd_ref;
@@ -613,9 +616,12 @@
 #define issig(x)               (sigispending(curlwp, 0))
 #define        ISSIG(thr, why)         (sigispending(thr, 0))
 #define        fm_panic                panic
-#ifndef ptob
+
+#ifdef ptob
+#undef ptob
+#endif
 #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)