From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Sep 2025 10:38:31 +0000 (+0200)
Subject: faccessat, truncate: Remove support for OSF/1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d51ff0bbb4458c85cce8e4d6f02bc11d017d804;p=thirdparty%2Fgnulib.git

faccessat, truncate: Remove support for OSF/1.

* lib/faccessat.c: Simplify include of <unistd.h>.
* lib/truncate.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 9a20593f70..a7203f3c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+	faccessat, truncate: Remove support for OSF/1.
+	* lib/faccessat.c: Simplify include of <unistd.h>.
+	* lib/truncate.c: Likewise.
+
 	fchmodat, fstat, fstatat, lstat, stat: Remove support for OSF/1.
 	* lib/fchmodat.c: Simplify include of <sys/stat.h>.
 	* lib/fstat.c: Likewise.
diff --git a/lib/faccessat.c b/lib/faccessat.c
index abb912090a..743f372887 100644
--- a/lib/faccessat.c
+++ b/lib/faccessat.c
@@ -22,7 +22,7 @@
 #define _GL_INCLUDING_UNISTD_H
 #include <config.h>
 
-/* Specification.  */
+/* Get the original definition of faccessat.  */
 #include <unistd.h>
 
 #include <errno.h>
@@ -40,14 +40,8 @@ orig_faccessat (int fd, char const *name, int mode, int flag)
 }
 #endif
 
-#ifdef __osf__
-/* Write "unistd.h" here, not <unistd.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <unistd.h>
-   above.  */
-# include "unistd.h"
-#else
-# include <unistd.h>
-#endif
+/* Specification.  */
+#include <unistd.h>
 
 #ifndef HAVE_ACCESS
 /* Mingw lacks access, but it also lacks real vs. effective ids, so
diff --git a/lib/truncate.c b/lib/truncate.c
index ca5f2cd5ea..e86129ae1a 100644
--- a/lib/truncate.c
+++ b/lib/truncate.c
@@ -20,7 +20,7 @@
 #define _GL_INCLUDING_UNISTD_H
 #include <config.h>
 
-/* Specification.  */
+/* Get the original definition of truncate.  */
 #include <unistd.h>
 
 #include <errno.h>
@@ -37,14 +37,8 @@ orig_truncate (const char *filename, off_t length)
 }
 #endif
 
-#ifdef __osf__
-/* Write "unistd.h" here, not <unistd.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <unistd.h>
-   above.  */
-# include "unistd.h"
-#else
-# include <unistd.h>
-#endif
+/* Specification.  */
+#include <unistd.h>
 
 int
 truncate (const char *filename, off_t length)