From 1221876a7aec2a59c824a9784f5ff24e96f5545b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 8 Aug 2021 22:11:03 +0200 Subject: [PATCH] canonicalize-lgpl: Fix conflict with z/OS . Reported by Mike Fulton in via Eric Blake. * lib/canonicalize-lgpl.c (__stat): Remove macro. (file_accessible): Use 'stat' instead. --- ChangeLog | 9 +++++++++ lib/canonicalize-lgpl.c | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7c7fb9c11..8482276384 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-08-08 Bruno Haible + + canonicalize-lgpl: Fix conflict with z/OS . + Reported by Mike Fulton in + + via Eric Blake. + * lib/canonicalize-lgpl.c (__stat): Remove macro. + (file_accessible): Use 'stat' instead. + 2021-08-08 Bruno Haible ptsname_r: Drop sync with glibc. diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index c6fef174c4..92e9639720 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -74,7 +74,6 @@ # define __pathconf pathconf # define __rawmemchr rawmemchr # define __readlink readlink -# define __stat stat # if IN_RELOCWRAPPER /* When building the relocatable program wrapper, use the system's memmove function, not the gnulib override, otherwise we would get a link error. @@ -105,7 +104,7 @@ file_accessible (char const *file) return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; # else struct stat st; - return __stat (file, &st) == 0 || errno == EOVERFLOW; + return stat (file, &st) == 0 || errno == EOVERFLOW; # endif } -- 2.39.5