]> Savannah Git Hosting - gnulib.git/commitdiff
stat, lstat: Fix conflict with relocatable-prog-wrapper module.
authorBruno Haible <bruno@clisp.org>
Sun, 24 Feb 2019 10:59:48 +0000 (11:59 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 24 Feb 2019 11:01:10 +0000 (12:01 +0100)
* 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.

ChangeLog
lib/fstat.c
lib/fstatat.c
lib/lstat.c
lib/stat.c

index 75dbeb0ff79af7cc6d46007a702b1867af674e99..176bff19529e376307da7ca0e9daf5bb809fd8db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
index 4f0e618810469344efdff56bbe702609c61c8cf0..a892b8ff7fae49660df1c5f18516f3d64ad02ee3 100644 (file)
@@ -40,10 +40,14 @@ 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"
+# include "sys/stat.h"
+#else
+# include <sys/stat.h>
+#endif
 
 #include "stat-time.h"
 
index 515b569399190311ce1d298eda75000d9764e3fd..019d3c616389f476aff8af94d30316395d86f4b6 100644 (file)
@@ -36,10 +36,14 @@ 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"
+# include "sys/stat.h"
+#else
+# include <sys/stat.h>
+#endif
 
 #include "stat-time.h"
 
index d57ca105fd3b5783053969dfa71b1f9b40af9775..a3e40d826f08a8f1dc1e5b51153d0e62a7dc61ef 100644 (file)
@@ -42,10 +42,14 @@ 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"
+#  include "sys/stat.h"
+# else
+#  include <sys/stat.h>
+# endif
 
 # include "stat-time.h"
 
index 74f47954c15065f7562dad76810d57d48878ebb5..e4fc2cb9305e9bb11cb7c5a2015e57879ae80862 100644 (file)
@@ -42,10 +42,14 @@ 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"
+# include "sys/stat.h"
+#else
+# include <sys/stat.h>
+#endif
 
 #include "stat-time.h"