# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1551005988 -3600
# Node ID dd30d6eb93bd6b9d4a4a34097af330aed4420aea
# Parent  5a34193cbc07ac3f3d3024abd8b03fb36eddefdd
stat, lstat: Fix conflict with relocatable-prog-wrapper module.

* lib/stat.c: On platforms other than OSF/1, include <sys/stat.h>, not
"sys/stat.h".
* lib/lstat.c: Likewise.
* lib/fstat.c: Likewise.
* lib/fstatat.c: Likewise.

diff -r 5a34193cbc07 -r dd30d6eb93bd ChangeLog
--- a/ChangeLog	Thu Nov 29 09:06:26 2018 +0100
+++ b/ChangeLog	Sun Feb 24 11:59:48 2019 +0100
@@ -1,3 +1,12 @@
+2019-02-24  Bruno Haible  <bruno@clisp.org>
+
+	stat, lstat: Fix conflict with relocatable-prog-wrapper module.
+	* lib/stat.c: On platforms other than OSF/1, include <sys/stat.h>, not
+	"sys/stat.h".
+	* lib/lstat.c: Likewise.
+	* lib/fstat.c: Likewise.
+	* lib/fstatat.c: Likewise.
+
 2019-02-23  Bernhard Voelker  <mail@bernhard-voelker.de>
 
 	long-options: add parse_gnu_standard_options_only
diff -r 5a34193cbc07 -r dd30d6eb93bd lib/fstat.c
--- a/lib/fstat.c	Thu Nov 29 09:06:26 2018 +0100
+++ b/lib/fstat.c	Sun Feb 24 11:59:48 2019 +0100
@@ -40,10 +40,14 @@
 #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"
+# include "sys/stat.h"
+#else
+# include <sys/stat.h>
+#endif
 
 #include "stat-time.h"
 
diff -r 5a34193cbc07 -r dd30d6eb93bd lib/fstatat.c
--- a/lib/fstatat.c	Thu Nov 29 09:06:26 2018 +0100
+++ b/lib/fstatat.c	Sun Feb 24 11:59:48 2019 +0100
@@ -36,10 +36,14 @@
 }
 #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"
+# include "sys/stat.h"
+#else
+# include <sys/stat.h>
+#endif
 
 #include "stat-time.h"
 
diff -r 5a34193cbc07 -r dd30d6eb93bd lib/lstat.c
--- a/lib/lstat.c	Thu Nov 29 09:06:26 2018 +0100
+++ b/lib/lstat.c	Sun Feb 24 11:59:48 2019 +0100
@@ -42,10 +42,14 @@
 }
 
 /* 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"
+#  include "sys/stat.h"
+# else
+#  include <sys/stat.h>
+# endif
 
 # include "stat-time.h"
 
diff -r 5a34193cbc07 -r dd30d6eb93bd lib/stat.c
--- a/lib/stat.c	Thu Nov 29 09:06:26 2018 +0100
+++ b/lib/stat.c	Sun Feb 24 11:59:48 2019 +0100
@@ -42,10 +42,14 @@
 #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"
+# include "sys/stat.h"
+#else
+# include <sys/stat.h>
+#endif
 
 #include "stat-time.h"