Module Name: src
Committed By: haad
Date: Mon Oct 12 10:05:29 UTC 2009
Modified Files:
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
Finaly fix ptob problem. ptob was defined for amd64 and not for i386, and
NetBSD version of ptob is not compatible with Solaris one.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/external/cddl/osnet/sys/sys/zfs_context.h:1.5
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.4 Sun Oct 11 22:17:57 2009
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Mon Oct 12 10:05:29 2009
@@ -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,10 +499,13 @@
#define ERESTART (-1)
#endif
-#ifndef ptob
-size_t ptob(size_t);
+#ifdef ptob
+#undef ptob
#endif
+size_t ptob(size_t);
+
+
typedef struct ksiddomain {
uint_t kd_ref;
uint_t kd_len;
@@ -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)
