CVS commit: src/external/cddl/osnet/dist/common/acl
Module Name:src
Committed By: joerg
Date: Tue Mar 15 00:48:04 UTC 2011
Modified Files:
src/external/cddl/osnet/dist/common/acl: acl_common.c
Log Message:
Don't define acl_alloc and acl_free during kernel builds.
Fixes module build with clang.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/common/acl/acl_common.c
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/dist/common/acl/acl_common.c
diff -u src/external/cddl/osnet/dist/common/acl/acl_common.c:1.3 src/external/cddl/osnet/dist/common/acl/acl_common.c:1.4
--- src/external/cddl/osnet/dist/common/acl/acl_common.c:1.3 Wed Mar 9 23:55:46 2011
+++ src/external/cddl/osnet/dist/common/acl/acl_common.c Tue Mar 15 00:48:04 2011
@@ -423,6 +423,7 @@
#endif
}
+#if !defined(_KERNEL)
acl_t *
acl_alloc(enum acl_type type)
{
@@ -468,6 +469,7 @@
cacl_free(aclp, sizeof (acl_t));
}
+#endif
static uint32_t
access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow)
CVS commit: src/external/cddl/osnet/dist/common/acl
Module Name:src Committed By: riz Date: Wed Mar 9 23:55:46 UTC 2011 Modified Files: src/external/cddl/osnet/dist/common/acl: acl_common.c Log Message: #include (from the ZFS sources) so that ASSERT() is defined, and we don't get problems like kern/44430. This is more a workaround than a fix, but at least I can load zfs now. ok haad@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/common/acl/acl_common.c 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/dist/common/acl/acl_common.c diff -u src/external/cddl/osnet/dist/common/acl/acl_common.c:1.2 src/external/cddl/osnet/dist/common/acl/acl_common.c:1.3 --- src/external/cddl/osnet/dist/common/acl/acl_common.c:1.2 Fri Aug 7 20:16:45 2009 +++ src/external/cddl/osnet/dist/common/acl/acl_common.c Wed Mar 9 23:55:46 2011 @@ -26,6 +26,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include +#include #include #include #if defined(_KERNEL)
