From: Bruno Haible Date: Wed, 24 Jul 2024 22:34:09 +0000 (+0200) Subject: Avoid false fstatat_used_without_requesting_gnulib_module_fstatat. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d9880c9668f95b967af5d804508640d66838cc6f;p=gnulib.git Avoid false fstatat_used_without_requesting_gnulib_module_fstatat. * modules/fstatat (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_stat.in.h (fstatat): Don't define to fstatat_used_without_requesting_gnulib_module_fstatat if the gnulib module 'fstatat' is in use under the same configure.ac. --- diff --git a/ChangeLog b/ChangeLog index 9a2ee86b2c..931bfa1513 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2024-07-24 Bruno Haible + Avoid false fstatat_used_without_requesting_gnulib_module_fstatat. + * modules/fstatat (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/sys_stat.in.h (fstatat): Don't define to + fstatat_used_without_requesting_gnulib_module_fstatat if the gnulib + module 'fstatat' is in use under the same configure.ac. + Avoid false fstat_used_without_requesting_gnulib_module_fstat. * modules/fstat (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_stat.in.h (fstat): Don't define to diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 4f2fb06417..18225df7f6 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -560,8 +560,10 @@ _GL_CXXALIAS_SYS (fstatat, int, # endif _GL_CXXALIASWARN (fstatat); #elif @GNULIB_OVERRIDES_STRUCT_STAT@ -# undef fstatat -# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat +# if !GNULIB_FSTATAT +# undef fstatat +# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat +# endif #elif defined GNULIB_POSIXCHECK # undef fstatat # if HAVE_RAW_DECL_FSTATAT diff --git a/modules/fstatat b/modules/fstatat index c2c12c6112..6ad36d1b82 100644 --- a/modules/fstatat +++ b/modules/fstatat @@ -28,6 +28,7 @@ gl_FUNC_FSTATAT gl_CONDITIONAL([GL_COND_OBJ_FSTATAT], [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1]) gl_SYS_STAT_MODULE_INDICATOR([fstatat]) +gl_MODULE_INDICATOR([fstatat]) Makefile.am: if GL_COND_OBJ_FSTATAT