From 1f11efc38ff8206cd863c2c9ca35fdcf463874ec Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Jul 2024 00:36:01 +0200 Subject: [PATCH] Avoid false lstat_used_without_requesting_gnulib_module_lstat. * modules/lstat (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/sys_stat.in.h (lstat): Don't define to lstat_used_without_requesting_gnulib_module_lstat if the gnulib module 'lstat' is in use under the same configure.ac. --- ChangeLog | 6 ++++++ lib/sys_stat.in.h | 6 ++++-- modules/lstat | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 931bfa1513..bb5f227535 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2024-07-24 Bruno Haible + Avoid false lstat_used_without_requesting_gnulib_module_lstat. + * modules/lstat (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/sys_stat.in.h (lstat): Don't define to + lstat_used_without_requesting_gnulib_module_lstat if the gnulib module + 'lstat' is in use under the same configure.ac. + 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 diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 18225df7f6..820c1087f7 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -934,8 +934,10 @@ _GL_CXXALIAS_SYS (lstat, int, _GL_CXXALIASWARN (lstat); # endif #elif @GNULIB_OVERRIDES_STRUCT_STAT@ -# undef lstat -# define lstat lstat_used_without_requesting_gnulib_module_lstat +# if !GNULIB_LSTAT +# undef lstat +# define lstat lstat_used_without_requesting_gnulib_module_lstat +# endif #elif defined GNULIB_POSIXCHECK # undef lstat # if HAVE_RAW_DECL_LSTAT diff --git a/modules/lstat b/modules/lstat index c6bb4b85c3..e89d158fc1 100644 --- a/modules/lstat +++ b/modules/lstat @@ -18,6 +18,7 @@ AM_COND_IF([GL_COND_OBJ_LSTAT], [ gl_PREREQ_LSTAT ]) gl_SYS_STAT_MODULE_INDICATOR([lstat]) +gl_MODULE_INDICATOR([lstat]) Makefile.am: if GL_COND_OBJ_LSTAT -- 2.39.5