diff options
| author | kmacy <kmacy@FreeBSD.org> | 2009-05-09 01:45:55 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2009-05-09 01:45:55 +0000 |
| commit | 0b931b9b69ece82f6c86a30beb2c759054414330 (patch) | |
| tree | 4c2c17426f2c2fad1e87ca530e8a7847c65bf152 /sys/cddl/contrib/opensolaris/common/acl | |
| parent | 810e5a84b4607c4d0fc76e9a418ae9fd2b0eeeb2 (diff) | |
| download | FreeBSD-src-0b931b9b69ece82f6c86a30beb2c759054414330.zip FreeBSD-src-0b931b9b69ece82f6c86a30beb2c759054414330.tar.gz | |
- rename atomic.S and crc32.c to avoid collisions when linking zfs in to the kernel
- update Makefile
- ifdef out acl_{alloc, free}, they aren't used by zfs and conflict with existing in-kernel routines
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common/acl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/acl/acl_common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/acl/acl_common.c b/sys/cddl/contrib/opensolaris/common/acl/acl_common.c index e6b6780..8d0cc85 100644 --- a/sys/cddl/contrib/opensolaris/common/acl/acl_common.c +++ b/sys/cddl/contrib/opensolaris/common/acl/acl_common.c @@ -424,6 +424,7 @@ cacl_free(void *ptr, size_t size) #endif } +#ifndef __FreeBSD__ acl_t * acl_alloc(enum acl_type type) { @@ -469,6 +470,7 @@ acl_free(acl_t *aclp) cacl_free(aclp, sizeof (acl_t)); } +#endif static uint32_t access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow) |
