Merge commit 'b572c3a256e7bf1e4eecc8c36448c08093240a6a' into stable

[gnulib.git] / lib / fopen.c

diff --git a/lib/fopen.c b/lib/fopen.c
index 81c8617..e9ba6bb 100644 (file)
--- a/lib/fopen.c
+++ b/lib/fopen.c
@@ -16,10 +16,13 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
+/* If the user's config.h happens to include <stdio.h>, let it include only
+   the system's <stdio.h> here, so that orig_fopen doesn't recurse to
+   rpl_fopen.  */
+#define __need_FILE
 #include <config.h>
 
 /* Get the original definition of fopen.  It might be defined as a macro.  */
-#define __need_FILE
 #include <stdio.h>
 #undef __need_FILE
 
@@ -30,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>