summaryrefslogtreecommitdiff
path: root/lib/stdio.in.h
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2022-01-03 16:17:18 +0100
committerBruno Haible <bruno@clisp.org>2022-01-03 16:17:18 +0100
commita690f1be8debcbe5d5265915233d533a7f9dcbaf (patch)
treed95f02000227834221e0a0eeec51039e1adb62e8 /lib/stdio.in.h
parent918e06951df709672d744e7600cc808b065a8e9e (diff)
downloadgnulib-a690f1be8debcbe5d5265915233d533a7f9dcbaf.tar.gz
fopen-gnu: Allow use as dependency from test modules.
* m4/fopen.m4 (gl_FUNC_FOPEN_GNU): Set REPLACE_FOPEN_FOR_FOPEN_GNU instead of REPLACE_FOPEN. * m4/stdio_h.m4 (gl_STDIO_H_REQUIRE_DEFAULTS): Initialize the fopen-gnu module indicator. (gl_STDIO_H_DEFAULTS): Initialize REPLACE_FOPEN_FOR_FOPEN_GNU. * modules/stdio (Makefile.am): Substitute GNULIB_FOPEN_GNU, REPLACE_FOPEN_FOR_FOPEN_GNU. * modules/fopen-gnu (Depends-on): Add more dependencies. (configure.ac): Test REPLACE_FOPEN_FOR_FOPEN_GNU instead of REPLACE_FOPEN. * lib/stdio.in.h (fopen): Test REPLACE_FOPEN, REPLACE_FOPEN_FOR_FOPEN_GNU, and the respective module indicators instead of just REPLACE_FOPEN.
Diffstat (limited to 'lib/stdio.in.h')
-rw-r--r--lib/stdio.in.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index 8fcec011d4..7b36dac2f5 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -399,7 +399,8 @@ _GL_CXXALIASWARN (fileno);
#endif
#if @GNULIB_FOPEN@
-# if @REPLACE_FOPEN@
+# if (@GNULIB_FOPEN@ && @REPLACE_FOPEN@) \
+ || (@GNULIB_FOPEN_GNU@ && @REPLACE_FOPEN_FOR_FOPEN_GNU@)
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef fopen
# define fopen rpl_fopen