aboutsummaryrefslogtreecommitdiff
path: root/archivers/rpm4/files/patch-misc_fts.c
diff options
context:
space:
mode:
Diffstat (limited to 'archivers/rpm4/files/patch-misc_fts.c')
-rw-r--r--archivers/rpm4/files/patch-misc_fts.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/archivers/rpm4/files/patch-misc_fts.c b/archivers/rpm4/files/patch-misc_fts.c
index 158aaadb7bdd..4db71d2d3f5a 100644
--- a/archivers/rpm4/files/patch-misc_fts.c
+++ b/archivers/rpm4/files/patch-misc_fts.c
@@ -1,11 +1,11 @@
---- misc/fts.c.orig 2020-10-25 13:22:41 UTC
+--- misc/fts.c.orig 2022-04-07 11:13:19 UTC
+++ misc/fts.c
-@@ -32,12 +32,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
- #endif /* LIBC_SCCS and not lint */
+@@ -37,12 +37,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
+ #endif
/* Conditional to set up proper fstat64 implementation */
--#if defined(hpux) || defined(sun)
-+#if defined(hpux) || defined(sun) || defined(__FreeBSD__)
+-#if defined(hpux) || defined(sun) || (defined(__APPLE__) && defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE))
++#if defined(hpux) || defined(sun) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE))
# define FTS_FSTAT64(_fd, _sbp) fstat((_fd), (_sbp))
#else
# define FTS_FSTAT64(_fd, _sbp) fstat64((_fd), (_sbp))
@@ -16,7 +16,7 @@
#if defined(_LIBC)
#include <sys/param.h>
#include <include/sys/stat.h>
-@@ -51,7 +53,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
+@@ -56,7 +58,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
#else
/* Conditionals for working around non-GNU environments */
@@ -25,8 +25,8 @@
# define _INCLUDE_POSIX_SOURCE
# define __errno_location() (&errno)
# define dirfd(dirp) -1
-@@ -65,13 +67,11 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
- # define __errno_location() (__error())
+@@ -73,13 +75,11 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
+ #endif
#endif
-#include "system.h"