From: Bruno Haible Date: Tue, 24 Dec 2024 10:13:16 +0000 (+0100) Subject: limits-h: Support several gnulib-tool invocations better. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=10c6359a19f15c0844de1eef2ff791c8d204da35;p=gnulib.git limits-h: Support several gnulib-tool invocations better. * lib/limits.in.h (_GL_ALREADY_INCLUDING_LIMITS_H): Rename to a macro that depends on GUARD_PREFIX. --- diff --git a/ChangeLog b/ChangeLog index 4c5ee6192d..ada9b17b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-12-24 Bruno Haible + + limits-h: Support several gnulib-tool invocations better. + * lib/limits.in.h (_GL_ALREADY_INCLUDING_LIMITS_H): Rename to a macro + that depends on GUARD_PREFIX. + 2024-12-23 Paul Eggert stdlib: fix MB_CUR_MAX on older Android diff --git a/lib/limits.in.h b/lib/limits.in.h index c65eb4c1cf..3347e369fb 100644 --- a/lib/limits.in.h +++ b/lib/limits.in.h @@ -20,7 +20,7 @@ #endif @PRAGMA_COLUMNS@ -#if defined _GL_ALREADY_INCLUDING_LIMITS_H +#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_LIMITS_H /* Special invocation convention: On Haiku/x86_64, we have a sequence of nested includes -> -> . @@ -34,12 +34,12 @@ #ifndef _@GUARD_PREFIX@_LIMITS_H -# define _GL_ALREADY_INCLUDING_LIMITS_H +# define _@GUARD_PREFIX@_ALREADY_INCLUDING_LIMITS_H /* The include_next requires a split double-inclusion guard. */ # @INCLUDE_NEXT@ @NEXT_LIMITS_H@ -# undef _GL_ALREADY_INCLUDING_LIMITS_H +# undef _@GUARD_PREFIX@_ALREADY_INCLUDING_LIMITS_H #ifndef _@GUARD_PREFIX@_LIMITS_H #define _@GUARD_PREFIX@_LIMITS_H