[Pkg-shadow-commits] r3571 - in upstream/trunk: . libmisc

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-11 11:59:21 +0000 (Fri, 11 Nov 2011)
New Revision: 3571

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/copydir.c
Log:
	* libmisc/copydir.c: Avoid conflict with glibc. Rename error to
	error_acl.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-11-11 11:35:56 UTC (rev 3570)
+++ upstream/trunk/ChangeLog	2011-11-11 11:59:21 UTC (rev 3571)
@@ -1,5 +1,10 @@
 2011-11-11  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* libmisc/copydir.c: Avoid conflict with glibc. Rename error to
+	error_acl.
+
+2011-11-11  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/newusers.8.xml: Document the optional file argument.
 	* man/newusers.8.xml: Fix the documentation of the inputs' format.
 

Modified: upstream/trunk/libmisc/copydir.c
===================================================================
--- upstream/trunk/libmisc/copydir.c	2011-11-11 11:35:56 UTC (rev 3570)
+++ upstream/trunk/libmisc/copydir.c	2011-11-11 11:59:21 UTC (rev 3571)
@@ -174,9 +174,9 @@
 
 #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 struct error_context ctx = {
-	error
+	error_acl
 };
 #endif				/* WITH_ACL || WITH_ATTR */