From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Fri, 11 Nov 2011 11:59:21 +0000 (+0000)
Subject: 	* libmisc/copydir.c: Avoid conflict with glibc. Rename error to
X-Git-Tag: 4.1.5~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bb7c436945d981689d4b905db81de2727e90985;p=thirdparty%2Fshadow.git

	* libmisc/copydir.c: Avoid conflict with glibc. Rename error to
	error_acl.
---

diff --git a/ChangeLog b/ChangeLog
index 310763b79..a48197a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-11  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* libmisc/copydir.c: Avoid conflict with glibc. Rename error to
+	error_acl.
+
 2011-11-11  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/newusers.8.xml: Document the optional file argument.
diff --git a/libmisc/copydir.c b/libmisc/copydir.c
index 5c6c05949..1774aeffa 100644
--- a/libmisc/copydir.c
+++ b/libmisc/copydir.c
@@ -174,9 +174,9 @@ int reset_selinux_file_context (void)
 
 #if defined(WITH_ACL) || defined(WITH_ATTR)
 /*
- * error - format the error messages for the ACL and EQ libraries.
+ * error_acl - format the error messages for the ACL and EQ libraries.
  */
-static void error (struct error_context *ctx, const char *fmt, ...)
+static void error_acl (struct error_context *ctx, const char *fmt, ...)
 {
 	va_list ap;
 
@@ -190,7 +190,7 @@ static void error (struct error_context *ctx, const char *fmt, ...)
 }
 
 static struct error_context ctx = {
-	error
+	error_acl
 };
 #endif				/* WITH_ACL || WITH_ATTR */