Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/sys/sys undef ptob if it was already def...



details:   https://anonhg.NetBSD.org/src/rev/9a5d1f62b274
branches:  trunk
changeset: 748048:9a5d1f62b274
user:      haad <haad%NetBSD.org@localhost>
date:      Sun Oct 11 10:56:13 2009 +0000

description:
undef ptob if it was already defined/included in some NetBSD header file.

diffstat:

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

diffs (20 lines):

diff -r e7a5440c182a -r 9a5d1f62b274 external/cddl/osnet/sys/sys/zfs_context.h
--- a/external/cddl/osnet/sys/sys/zfs_context.h Sun Oct 11 10:54:52 2009 +0000
+++ b/external/cddl/osnet/sys/sys/zfs_context.h Sun Oct 11 10:56:13 2009 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index