From: Bruno Haible Date: Mon, 11 Nov 2024 08:33:11 +0000 (+0100) Subject: getpagesize: Fix use of 'extern inline' (regression 2012-11-20). X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=7fb87728fb4540732d60c7a303326eb2983d173b;p=gnulib.git getpagesize: Fix use of 'extern inline' (regression 2012-11-20). * lib/unistd.in.h (_GL_GETPAGESIZE_INLINE): New macro. (getpagesize): Use it. * lib/getpagesize.c (_GL_GETPAGESIZE_INLINE): Define. * modules/getpagesize (configure.ac): Compile getpagesize.c also when getpagesize is missing. --- diff --git a/ChangeLog b/ChangeLog index 30ec241d31..880cdff1a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-11-11 Bruno Haible + + getpagesize: Fix use of 'extern inline' (regression 2012-11-20). + * lib/unistd.in.h (_GL_GETPAGESIZE_INLINE): New macro. + (getpagesize): Use it. + * lib/getpagesize.c (_GL_GETPAGESIZE_INLINE): Define. + * modules/getpagesize (configure.ac): Compile getpagesize.c also when + getpagesize is missing. + 2024-11-10 Bruno Haible relocatable-prog-wrapper: Fix compilation error on NetBSD 7. diff --git a/lib/getpagesize.c b/lib/getpagesize.c index d203155329..dd880a6ca2 100644 --- a/lib/getpagesize.c +++ b/lib/getpagesize.c @@ -20,6 +20,7 @@ #include /* Specification. */ +#define _GL_GETPAGESIZE_INLINE _GL_EXTERN_INLINE #include /* This implementation is only for native Windows systems. */ diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 952e153bcd..6c5ee5bf07 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -180,6 +180,9 @@ _GL_INLINE_HEADER_BEGIN #ifndef _GL_UNISTD_INLINE # define _GL_UNISTD_INLINE _GL_INLINE #endif +#ifndef _GL_GETPAGESIZE_INLINE +# define _GL_GETPAGESIZE_INLINE _GL_INLINE +#endif /* Hide some function declarations from . */ @@ -1460,7 +1463,7 @@ _GL_FUNCDECL_SYS (getpagesize, int, (void)); # define getpagesize() _gl_getpagesize () # else # if !GNULIB_defined_getpagesize_function -_GL_UNISTD_INLINE int +_GL_GETPAGESIZE_INLINE int getpagesize () { return _gl_getpagesize (); diff --git a/modules/getpagesize b/modules/getpagesize index 7b38fff93b..a883edf067 100644 --- a/modules/getpagesize +++ b/modules/getpagesize @@ -10,7 +10,8 @@ unistd configure.ac: gl_FUNC_GETPAGESIZE -gl_CONDITIONAL([GL_COND_OBJ_GETPAGESIZE], [test $REPLACE_GETPAGESIZE = 1]) +gl_CONDITIONAL([GL_COND_OBJ_GETPAGESIZE], + [test $HAVE_GETPAGESIZE = 0 || test $REPLACE_GETPAGESIZE = 1]) gl_UNISTD_MODULE_INDICATOR([getpagesize]) Makefile.am: