--- 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

--- a/lib/fopen.c
+++ b/lib/fopen.c
@@ -33,7 +33,9 @@
 }
 
 /* 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>

--- a/lib/freopen.c
+++ b/lib/freopen.c
@@ -33,7 +33,9 @@
 }
 
 /* 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>
 

--- a/lib/fstatat.c
+++ b/lib/fstatat.c
@@ -36,7 +36,10 @@
 }
 #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>

--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -42,7 +42,10 @@
 }
 
 /* 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>

--- a/lib/open.c
+++ b/lib/open.c
@@ -34,7 +34,9 @@
 }
 
 /* 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>

--- a/lib/openat.c
+++ b/lib/openat.c
@@ -35,6 +35,10 @@
 }
 #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>

--- a/lib/stat.c
+++ b/lib/stat.c
@@ -34,7 +34,10 @@
 }
 
 /* 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>