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

fchmodat, fstat, fstatat, lstat, stat: Remove support for OSF/1.

* lib/fchmodat.c: Simplify include of <sys/stat.h>.
* lib/fstat.c: Likewise.
* lib/fstatat.c: Likewise.
* lib/lstat.c: Likewise.
* lib/stat.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 373509bba1..9a20593f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+	fchmodat, fstat, fstatat, lstat, stat: Remove support for OSF/1.
+	* lib/fchmodat.c: Simplify include of <sys/stat.h>.
+	* lib/fstat.c: Likewise.
+	* lib/fstatat.c: Likewise.
+	* lib/lstat.c: Likewise.
+	* lib/stat.c: Likewise.
+
 	fopen, freopen: Remove support for OSF/1.
 	* lib/fopen.c: Simplify include of <stdio.h>.
 	* lib/freopen.c: Likewise.
diff --git a/lib/fchmodat.c b/lib/fchmodat.c
index 06a20cc345..9151778b8e 100644
--- a/lib/fchmodat.c
+++ b/lib/fchmodat.c
@@ -22,7 +22,7 @@
 #define __need_system_sys_stat_h
 #include <config.h>
 
-/* Specification.  */
+/* Get the original definition of fchmodat.  */
 #include <sys/stat.h>
 #undef __need_system_sys_stat_h
 
@@ -41,14 +41,8 @@ orig_fchmodat (int dir, char const *file, mode_t mode, int flags)
 #include <string.h>
 #include <unistd.h>
 
-#ifdef __osf__
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-# include "sys/stat.h"
-#else
-# include <sys/stat.h>
-#endif
+/* Specification.  */
+#include <sys/stat.h>
 
 #include <intprops.h>
 
diff --git a/lib/fstat.c b/lib/fstat.c
index 200e672ec2..e219cf9916 100644
--- a/lib/fstat.c
+++ b/lib/fstat.c
@@ -40,14 +40,7 @@ orig_fstat (int fd, struct stat *buf)
 #endif
 
 /* Specification.  */
-#ifdef __osf__
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-# include "sys/stat.h"
-#else
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 
 #include "stat-time.h"
 
diff --git a/lib/fstatat.c b/lib/fstatat.c
index 36dd5e9a20..6029de7884 100644
--- a/lib/fstatat.c
+++ b/lib/fstatat.c
@@ -36,14 +36,8 @@ orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
 }
 #endif
 
-#ifdef __osf__
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-# include "sys/stat.h"
-#else
-# include <sys/stat.h>
-#endif
+/* Specification.  */
+#include <sys/stat.h>
 
 #include "stat-time.h"
 
diff --git a/lib/lstat.c b/lib/lstat.c
index bb4a59f174..f5fda4af77 100644
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -42,14 +42,7 @@ orig_lstat (const char *filename, struct stat *buf)
 }
 
 /* Specification.  */
-# ifdef __osf__
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-#  include "sys/stat.h"
-# else
-#  include <sys/stat.h>
-# endif
+# include <sys/stat.h>
 
 # include "stat-time.h"
 
diff --git a/lib/stat.c b/lib/stat.c
index 6663783703..9c44ba43b4 100644
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -42,14 +42,7 @@ orig_stat (const char *filename, struct stat *buf)
 #endif
 
 /* Specification.  */
-#ifdef __osf__
-/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
-   eliminates this include because of the preliminary #include <sys/stat.h>
-   above.  */
-# include "sys/stat.h"
-#else
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 
 #include "stat-time.h"