Permalink
Browse files

Fix build failure when ACL_TYPE_NFS4 is not defined.

Signed-off-by: Andres Mejia <amejia004@gmail.com>
  • Loading branch information...
1 parent 51b2b76 commit 488798d8734f7624a34d4ae800bed47d625843da @toofishes toofishes committed with amejia1 Aug 29, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 libarchive/archive_read_disk_entry_from_file.c
  2. +1 −1 libarchive/archive_write_disk_acl.c
@@ -388,7 +388,7 @@ setup_mac_metadata(struct archive_read_disk *a,
#endif
-#ifdef HAVE_POSIX_ACL
+#if defined(HAVE_POSIX_ACL) && defined(ACL_TYPE_NFS4)
static int translate_acl(struct archive_read_disk *a,
struct archive_entry *entry, acl_t acl, int archive_entry_acl_type);
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_disk.c 201159 2009-12-29 0
#include "archive_acl_private.h"
#include "archive_write_disk_private.h"
-#ifndef HAVE_POSIX_ACL
+#if !defined(HAVE_POSIX_ACL) || !defined(ACL_TYPE_NFS4)
/* Default empty function body to satisfy mainline code. */
int
archive_write_disk_set_acls(struct archive *a, int fd, const char *name,

0 comments on commit 488798d

Please sign in to comment.