openat: Work around compilation error with OSF/1 5.1 DTK cc.

* lib/fopen.c: Use different syntax for include of <stdio.h>.
* lib/freopen.c: Likewise.
* lib/fstatat.c: Use different syntax for include of <sys/stat.h>.
* lib/lstat.c: Likewise.
* lib/stat.c: Likewise.
* lib/open.c: Use different syntax for include of <fcntl.h>.
* lib/openat.c: Include fcntl.h again, explicitly.

diff --git a/ChangeLog b/ChangeLog
index 2f64d74..56ada70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-07  Bruno Haible  <bruno@clisp.org>
+
+       openat: Work around compilation error with OSF/1 5.1 DTK cc.
+       * lib/fopen.c: Use different syntax for include of <stdio.h>.
+       * lib/freopen.c: Likewise.
+       * lib/fstatat.c: Use different syntax for include of <sys/stat.h>.
+       * lib/lstat.c: Likewise.
+       * lib/stat.c: Likewise.
+       * lib/open.c: Use different syntax for include of <fcntl.h>.
+       * lib/openat.c: Include fcntl.h again, explicitly.
+
 2011-09-04  J.T. Conklin  <jtc@acorntoolworks.com>
 
        parse-datetime: document the newly accepted format

diff --git a/lib/fopen.c b/lib/fopen.c
index 33412fb..e9ba6bb 100644 (file)
--- a/lib/fopen.c
+++ b/lib/fopen.c
@@ -33,7 +33,9 @@ orig_fopen (const char *filename, const char *mode)
 }
 
 /* Specification.  */
-#include <stdio.h>
+/* Write "stdio.h" here, not <stdio.h>, otherwise OSF/1 5.1 DTK cc eliminates
+   this include because of the preliminary #include <stdio.h> above.  */
+#include "stdio.h"
 
 #include <errno.h>
 #include <fcntl.h>

diff --git a/lib/freopen.c b/lib/freopen.c
index bae0646..7069ec9 100644 (file)
--- a/lib/freopen.c
+++ b/lib/freopen.c
@@ -33,7 +33,9 @@ orig_freopen (const char *filename, const char *mode, FILE *stream)
 }
 
 /* Specification.  */
-#include <stdio.h>
+/* Write "stdio.h" here, not <stdio.h>, otherwise OSF/1 5.1 DTK cc eliminates
+   this include because of the preliminary #include <stdio.h> above.  */
+#include "stdio.h"
 
 #include <string.h>
 

diff --git a/lib/fstatat.c b/lib/fstatat.c
index 326ce21..4b01d66 100644 (file)
--- a/lib/fstatat.c
+++ b/lib/fstatat.c
@@ -36,7 +36,10 @@ orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
 }
 #endif
 
-#include <sys/stat.h>
+/* 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 <errno.h>
 #include <fcntl.h>

diff --git a/lib/lstat.c b/lib/lstat.c
index 29fc6d2..d786288 100644 (file)
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -42,7 +42,10 @@ orig_lstat (const char *filename, struct stat *buf)
 }
 
 /* Specification.  */
-# include <sys/stat.h>
+/* 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 <string.h>
 # include <errno.h>

diff --git a/lib/open.c b/lib/open.c
index ffd3b8d..8dc36ef 100644 (file)
--- a/lib/open.c
+++ b/lib/open.c
@@ -34,7 +34,9 @@ orig_open (const char *filename, int flags, mode_t mode)
 }
 
 /* Specification.  */
-#include <fcntl.h>
+/* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates
+   this include because of the preliminary #include <fcntl.h> above.  */
+#include "fcntl.h"
 
 #include <errno.h>
 #include <stdarg.h>

diff --git a/lib/openat.c b/lib/openat.c
index cc4b9d0..0768b48 100644 (file)
--- a/lib/openat.c
+++ b/lib/openat.c
@@ -35,6 +35,10 @@ orig_openat (int fd, char const *filename, int flags, mode_t mode)
 }
 #endif
 
+/* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates
+   this include because of the preliminary #include <fcntl.h> above.  */
+#include "fcntl.h"
+
 #include "openat.h"
 
 #include <stdarg.h>

diff --git a/lib/stat.c b/lib/stat.c
index 6c354d1..1002f16 100644 (file)
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -34,7 +34,10 @@ orig_stat (const char *filename, struct stat *buf)
 }
 
 /* Specification.  */
-#include <sys/stat.h>
+/* 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 <errno.h>
 #include <limits.h>