From feb51569a814c828adde7982d1e6c690e3dddc92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= Date: Fri, 19 Jun 2020 13:18:11 +0200 Subject: [PATCH 1/2] Prevent unnecessary xattr warning by reordering header inclusion. xattr headers have been provided by glibc (at least on Linux/glibc) for many years now. Reorder the inclusion of xattr headers to attempt compatibility/legacy after the common case. This prevents the warning without changing compatibility to non-glibc systems. --- lib/sysxattrs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sysxattrs.h b/lib/sysxattrs.h index 428421a04..024bbd184 100644 --- a/lib/sysxattrs.h +++ b/lib/sysxattrs.h @@ -1,9 +1,9 @@ #ifdef SUPPORT_XATTRS -#if defined HAVE_ATTR_XATTR_H -#include -#elif defined HAVE_SYS_XATTR_H +#if defined HAVE_SYS_XATTR_H #include +#elif defined HAVE_ATTR_XATTR_H +#include #elif defined HAVE_SYS_EXTATTR_H #include #endif From 2b6075164918b719aba464ff0fe7803b0e21079e Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 19 Jun 2020 08:21:18 -0700 Subject: [PATCH 2/2] Add dependency on lib/sysxattrs.h header --- Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.in b/Makefile.in index 17dae3a68..31ddc43b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,6 +100,7 @@ rsync$(EXEEXT): $(OBJS) $(OBJS): $(HEADERS) $(CHECK_OBJS): $(HEADERS) +tls.o xattrs.o: lib/sysxattrs.h options.o: latest-year.h help-rsync.h help-rsyncd.h exclude.o: default-cvsignore.h loadparm.o: default-dont-compress.h