In *.c files using the "#define AAA_INLINE _GL_EXTERN_INLINE" idiom, put the idiom before including <config.h>. This is suggested in the Gnulib documentation, and avoids problems when an application like Emacs rashly defines a config.h file that includes a *.h file that uses the documented "#ifndef AAA_INLINE / # define AAA_INLINE _GL_INLINE / #endif" idiom. --- ChangeLog | 10 ++++++++++ lib/acl-internal.c | 2 +- lib/alignalloc.c | 3 +-- lib/arpa_inet.c | 3 +-- lib/base32.c | 2 +- lib/base64.c | 2 +- lib/binary-io.c | 3 +-- lib/bitrotate.c | 3 +-- lib/byteswap.c | 3 +-- lib/c-ctype.c | 3 +-- lib/chmodat.c | 3 +-- lib/chownat.c | 3 +-- lib/count-leading-zeros.c | 3 +-- lib/count-one-bits.c | 3 +-- lib/count-trailing-zeros.c | 3 +-- lib/eealloc.c | 3 +-- lib/endian.c | 1 - lib/execinfo.c | 3 +-- lib/gethrxtime.c | 3 +-- lib/getpagesize.c | 2 +- lib/gl_list.c | 3 +-- lib/gl_map.c | 3 +-- lib/gl_omap.c | 3 +-- lib/gl_oset.c | 3 +-- lib/gl_set.c | 3 +-- lib/gl_xlist.c | 3 +-- lib/gl_xmap.c | 3 +-- lib/gl_xomap.c | 3 +-- lib/gl_xoset.c | 3 +-- lib/gl_xset.c | 3 +-- lib/gl_xsublist.c | 3 +-- lib/glthread/cond.c | 3 +-- lib/hamt.c | 2 +- lib/ialloc.c | 3 +-- lib/issymlink.c | 3 +-- lib/issymlinkat.c | 3 +-- lib/mbchar.c | 3 +-- lib/mbfile.c | 3 +-- lib/mbiter.c | 3 +-- lib/mbiterf.c | 3 +-- lib/mbuiter.c | 3 +-- lib/mbuiterf.c | 3 +-- lib/mcel.c | 2 +- lib/pipe-filter-aux.c | 4 +--- lib/priv-set.c | 4 +--- lib/realloc.c | 2 +- lib/safe-alloc.c | 3 +-- lib/same-inode.c | 2 +- lib/savewd.c | 4 +--- lib/se-context.c | 3 +-- lib/se-label.c | 3 +-- lib/se-selinux.c | 3 +-- lib/sig-handler.c | 3 +-- lib/stat-time.c | 3 +-- lib/statat.c | 3 +-- lib/stdc_bit_ceil.c | 3 +-- lib/stdc_bit_floor.c | 3 +-- lib/stdc_bit_width.c | 3 +-- lib/stdc_count_ones.c | 3 +-- lib/stdc_count_zeros.c | 3 +-- lib/stdc_first_leading_one.c | 3 +-- lib/stdc_first_leading_zero.c | 3 +-- lib/stdc_first_trailing_one.c | 3 +-- lib/stdc_first_trailing_zero.c | 3 +-- lib/stdc_has_single_bit.c | 3 +-- lib/stdc_leading_ones.c | 3 +-- lib/stdc_leading_zeros.c | 3 +-- lib/stdc_trailing_ones.c | 3 +-- lib/stdc_trailing_zeros.c | 3 +-- lib/string-desc-quotearg.c | 3 +-- lib/string-desc.c | 3 +-- lib/string.c | 3 +-- lib/timespec.c | 3 +-- lib/u64.c | 4 ++-- lib/utimens.c | 2 +- lib/xbinary-io.c | 3 +-- lib/xmalloc.c | 4 +--- lib/xsize.c | 3 +-- lib/xstring-desc.c | 3 +-- lib/xtime.c | 3 +-- 80 files changed, 89 insertions(+), 152 deletions(-)
diff --git a/ChangeLog b/ChangeLog index fa91828f1b..e5e67e7a8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2025-12-12 Paul Eggert <[email protected]> + + extern-inline: #define AAA_INLINE pre-<config.h> + In *.c files using the "#define AAA_INLINE _GL_EXTERN_INLINE" idiom, + put the idiom before including <config.h>. This is suggested in + the Gnulib documentation, and avoids problems when an application + like Emacs rashly defines a config.h file that includes a *.h file + that uses the documented "#ifndef AAA_INLINE / # define AAA_INLINE + _GL_INLINE / #endif" idiom. + 2025-12-11 Bruno Haible <[email protected]> relocatable-prog{,-wrapper}: Fix autoconf error (regr. 2025-12-09). diff --git a/lib/acl-internal.c b/lib/acl-internal.c index 8c173bf4f1..413be44e6e 100644 --- a/lib/acl-internal.c +++ b/lib/acl-internal.c @@ -17,10 +17,10 @@ Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */ +#define ACL_INTERNAL_INLINE _GL_EXTERN_INLINE #include <config.h> /* Specification. */ -#define ACL_INTERNAL_INLINE _GL_EXTERN_INLINE #include "acl-internal.h" #include "acl.h" diff --git a/lib/alignalloc.c b/lib/alignalloc.c index 93c369bced..2ae572588a 100644 --- a/lib/alignalloc.c +++ b/lib/alignalloc.c @@ -17,9 +17,8 @@ /* Written by Paul Eggert. */ -#include <config.h> - #define ALIGNALLOC_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "alignalloc.h" #include <limits.h> diff --git a/lib/arpa_inet.c b/lib/arpa_inet.c index fae7c24147..4ea2dffa05 100644 --- a/lib/arpa_inet.c +++ b/lib/arpa_inet.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_ARPA_INET_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <arpa/inet.h> diff --git a/lib/base32.c b/lib/base32.c index d5a49d634d..c41b2955d5 100644 --- a/lib/base32.c +++ b/lib/base32.c @@ -37,10 +37,10 @@ * */ +#define BASE32_INLINE _GL_EXTERN_INLINE #include <config.h> /* Get prototype. */ -#define BASE32_INLINE _GL_EXTERN_INLINE #include "base32.h" /* Get imalloc. */ diff --git a/lib/base64.c b/lib/base64.c index ac3ad4f3bc..480a411d1b 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -39,10 +39,10 @@ * */ +#define BASE64_INLINE _GL_EXTERN_INLINE #include <config.h> /* Get prototype. */ -#define BASE64_INLINE _GL_EXTERN_INLINE #include "base64.h" /* Get imalloc. */ diff --git a/lib/binary-io.c b/lib/binary-io.c index d2937b8f63..bc096a861d 100644 --- a/lib/binary-io.c +++ b/lib/binary-io.c @@ -14,9 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define BINARY_IO_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "binary-io.h" #if defined __DJGPP__ || defined __EMX__ diff --git a/lib/bitrotate.c b/lib/bitrotate.c index 6f6d306e9f..ebf38c8be8 100644 --- a/lib/bitrotate.c +++ b/lib/bitrotate.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define BITROTATE_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "bitrotate.h" diff --git a/lib/byteswap.c b/lib/byteswap.c index 97f7fc9ebf..0b5b888442 100644 --- a/lib/byteswap.c +++ b/lib/byteswap.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_BYTESWAP_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <byteswap.h> diff --git a/lib/c-ctype.c b/lib/c-ctype.c index ecf2c08320..960155f3f3 100644 --- a/lib/c-ctype.c +++ b/lib/c-ctype.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define C_CTYPE_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "c-ctype.h" diff --git a/lib/chmodat.c b/lib/chmodat.c index ed5f2e8c12..f04fd5f773 100644 --- a/lib/chmodat.c +++ b/lib/chmodat.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define CHMODAT_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "openat.h" diff --git a/lib/chownat.c b/lib/chownat.c index 116f42f0b0..6cab1eb939 100644 --- a/lib/chownat.c +++ b/lib/chownat.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define CHOWNAT_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "openat.h" diff --git a/lib/count-leading-zeros.c b/lib/count-leading-zeros.c index 87e83b3fad..3b450fa479 100644 --- a/lib/count-leading-zeros.c +++ b/lib/count-leading-zeros.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define COUNT_LEADING_ZEROS_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "count-leading-zeros.h" diff --git a/lib/count-one-bits.c b/lib/count-one-bits.c index e2d732851b..60d72136d1 100644 --- a/lib/count-one-bits.c +++ b/lib/count-one-bits.c @@ -15,9 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define COUNT_ONE_BITS_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "count-one-bits.h" #if 1500 <= _MSC_VER && (defined _M_IX86 || defined _M_X64) diff --git a/lib/count-trailing-zeros.c b/lib/count-trailing-zeros.c index 122feba617..d561c654d0 100644 --- a/lib/count-trailing-zeros.c +++ b/lib/count-trailing-zeros.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define COUNT_TRAILING_ZEROS_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "count-trailing-zeros.h" diff --git a/lib/eealloc.c b/lib/eealloc.c index 97ff2a233a..daea89815f 100644 --- a/lib/eealloc.c +++ b/lib/eealloc.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define EEALLOC_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "eealloc.h" diff --git a/lib/endian.c b/lib/endian.c index 702f7e0d69..bfa551d6da 100644 --- a/lib/endian.c +++ b/lib/endian.c @@ -19,5 +19,4 @@ #define _GL_ENDIAN_INLINE _GL_EXTERN_INLINE #include <config.h> - #include <endian.h> diff --git a/lib/execinfo.c b/lib/execinfo.c index a9fe54075f..745fbbb052 100644 --- a/lib/execinfo.c +++ b/lib/execinfo.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_EXECINFO_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "execinfo.h" diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c index e1c25d6e5a..402014c3f3 100644 --- a/lib/gethrxtime.c +++ b/lib/gethrxtime.c @@ -17,9 +17,8 @@ /* Written by Paul Eggert. */ -#include <config.h> - #define GETHRXTIME_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gethrxtime.h" #if ! (HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME) diff --git a/lib/getpagesize.c b/lib/getpagesize.c index c4434ef644..c4a649bd6d 100644 --- a/lib/getpagesize.c +++ b/lib/getpagesize.c @@ -17,10 +17,10 @@ /* Written by Bruno Haible and Martin Lambers. */ +#define _GL_GETPAGESIZE_INLINE _GL_EXTERN_INLINE #include <config.h> /* Specification. */ -#define _GL_GETPAGESIZE_INLINE _GL_EXTERN_INLINE #include <unistd.h> /* This implementation is only for native Windows systems. */ diff --git a/lib/gl_list.c b/lib/gl_list.c index edf80f9a67..bd94705384 100644 --- a/lib/gl_list.c +++ b/lib/gl_list.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_LIST_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_list.h" diff --git a/lib/gl_map.c b/lib/gl_map.c index b317524b39..548335c68c 100644 --- a/lib/gl_map.c +++ b/lib/gl_map.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_MAP_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_map.h" diff --git a/lib/gl_omap.c b/lib/gl_omap.c index 9cdeccec4e..6859d2f707 100644 --- a/lib/gl_omap.c +++ b/lib/gl_omap.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_OMAP_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_omap.h" diff --git a/lib/gl_oset.c b/lib/gl_oset.c index 6335f59085..93bb4930f0 100644 --- a/lib/gl_oset.c +++ b/lib/gl_oset.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_OSET_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_oset.h" diff --git a/lib/gl_set.c b/lib/gl_set.c index 4c7897d151..e901f5e147 100644 --- a/lib/gl_set.c +++ b/lib/gl_set.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_SET_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_set.h" diff --git a/lib/gl_xlist.c b/lib/gl_xlist.c index cd34366e35..c436505692 100644 --- a/lib/gl_xlist.c +++ b/lib/gl_xlist.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_XLIST_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_xlist.h" diff --git a/lib/gl_xmap.c b/lib/gl_xmap.c index 394a8b6078..974b84f689 100644 --- a/lib/gl_xmap.c +++ b/lib/gl_xmap.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_XMAP_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_xmap.h" diff --git a/lib/gl_xomap.c b/lib/gl_xomap.c index 10093d15ce..bec6d46eac 100644 --- a/lib/gl_xomap.c +++ b/lib/gl_xomap.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_XOMAP_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_xomap.h" diff --git a/lib/gl_xoset.c b/lib/gl_xoset.c index 96fa047e1d..ee7feed2ce 100644 --- a/lib/gl_xoset.c +++ b/lib/gl_xoset.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_XOSET_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_xoset.h" diff --git a/lib/gl_xset.c b/lib/gl_xset.c index 000ee9b37e..34ac2a2909 100644 --- a/lib/gl_xset.c +++ b/lib/gl_xset.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_XSET_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_xset.h" diff --git a/lib/gl_xsublist.c b/lib/gl_xsublist.c index bbfee3b5db..d9af6e0b4b 100644 --- a/lib/gl_xsublist.c +++ b/lib/gl_xsublist.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_XSUBLIST_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "gl_xsublist.h" diff --git a/lib/glthread/cond.c b/lib/glthread/cond.c index 9d0715c244..6d39fb0323 100644 --- a/lib/glthread/cond.c +++ b/lib/glthread/cond.c @@ -17,9 +17,8 @@ /* Written by Yoann Vandoorselaere <[email protected]>, 2008, and Bruno Haible <[email protected]>, 2008. */ -#include <config.h> - #define _GLTHREAD_COND_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "glthread/cond.h" /* ========================================================================= */ diff --git a/lib/hamt.c b/lib/hamt.c index 3049333cae..eab4600e5f 100644 --- a/lib/hamt.c +++ b/lib/hamt.c @@ -16,8 +16,8 @@ /* Written by Marc Nieper-Wißkirchen <[email protected]>, 2021. */ -#include <config.h> #define _GL_HAMT_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "hamt.h" #include <flexmember.h> diff --git a/lib/ialloc.c b/lib/ialloc.c index 881c8f0484..0db987288f 100644 --- a/lib/ialloc.c +++ b/lib/ialloc.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define IALLOC_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "ialloc.h" diff --git a/lib/issymlink.c b/lib/issymlink.c index dbf56c037c..85bd071540 100644 --- a/lib/issymlink.c +++ b/lib/issymlink.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_ISSYMLINK_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "issymlink.h" diff --git a/lib/issymlinkat.c b/lib/issymlinkat.c index ebd937e91b..b98f38e841 100644 --- a/lib/issymlinkat.c +++ b/lib/issymlinkat.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_ISSYMLINKAT_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "issymlinkat.h" diff --git a/lib/mbchar.c b/lib/mbchar.c index 713c2f749e..5aef58232c 100644 --- a/lib/mbchar.c +++ b/lib/mbchar.c @@ -14,9 +14,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define MBCHAR_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <limits.h> diff --git a/lib/mbfile.c b/lib/mbfile.c index f4e3e775e7..72bc588803 100644 --- a/lib/mbfile.c +++ b/lib/mbfile.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define MBFILE_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "mbfile.h" diff --git a/lib/mbiter.c b/lib/mbiter.c index 478f6bffcc..51dc678936 100644 --- a/lib/mbiter.c +++ b/lib/mbiter.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define MBITER_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "mbiter.h" diff --git a/lib/mbiterf.c b/lib/mbiterf.c index ad354c55c7..2994e3287b 100644 --- a/lib/mbiterf.c +++ b/lib/mbiterf.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define MBITERF_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "mbiterf.h" diff --git a/lib/mbuiter.c b/lib/mbuiter.c index 860c6a82d8..6fa68a4123 100644 --- a/lib/mbuiter.c +++ b/lib/mbuiter.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define MBUITER_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "mbuiter.h" diff --git a/lib/mbuiterf.c b/lib/mbuiterf.c index 63113c7b3b..e27c85ad57 100644 --- a/lib/mbuiterf.c +++ b/lib/mbuiterf.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define MBUITERF_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "mbuiterf.h" diff --git a/lib/mcel.c b/lib/mcel.c index 8e80b322bf..ded8987faa 100644 --- a/lib/mcel.c +++ b/lib/mcel.c @@ -14,6 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> #define MCEL_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "mcel.h" diff --git a/lib/pipe-filter-aux.c b/lib/pipe-filter-aux.c index 596511ea98..161439c27d 100644 --- a/lib/pipe-filter-aux.c +++ b/lib/pipe-filter-aux.c @@ -14,10 +14,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define PIPE_FILTER_AUX_INLINE _GL_EXTERN_INLINE - +#include <config.h> #include "pipe-filter.h" #include <errno.h> diff --git a/lib/priv-set.c b/lib/priv-set.c index f3247c5a3d..1c5c44730a 100644 --- a/lib/priv-set.c +++ b/lib/priv-set.c @@ -17,10 +17,8 @@ Written by David Bartley. */ -#include <config.h> - #define PRIV_SET_INLINE _GL_EXTERN_INLINE - +#include <config.h> #include "priv-set.h" #if HAVE_GETPPRIV && HAVE_PRIV_H diff --git a/lib/realloc.c b/lib/realloc.c index cf0bf6e9f7..b0dd28b5da 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -20,9 +20,9 @@ /* Ensure that we call the system's realloc() below. */ #define _GL_USE_STDLIB_ALLOC 1 -#include <config.h> #define _GL_REALLOC_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdlib.h> #include <errno.h> diff --git a/lib/safe-alloc.c b/lib/safe-alloc.c index a487d82667..703ebd0239 100644 --- a/lib/safe-alloc.c +++ b/lib/safe-alloc.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define SAFE_ALLOC_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "safe-alloc.h" diff --git a/lib/same-inode.c b/lib/same-inode.c index 49a49e08ea..b60b7b5688 100644 --- a/lib/same-inode.c +++ b/lib/same-inode.c @@ -15,6 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> #define SAME_INODE_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "same-inode.h" diff --git a/lib/savewd.c b/lib/savewd.c index 17c73c7df7..0ca222517d 100644 --- a/lib/savewd.c +++ b/lib/savewd.c @@ -17,10 +17,8 @@ /* Written by Paul Eggert. */ -#include <config.h> - #define SAVEWD_INLINE _GL_EXTERN_INLINE - +#include <config.h> #include "savewd.h" #include <errno.h> diff --git a/lib/se-context.c b/lib/se-context.c index 38e67c37a0..f777e82092 100644 --- a/lib/se-context.c +++ b/lib/se-context.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define SE_CONTEXT_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <selinux/context.h> diff --git a/lib/se-label.c b/lib/se-label.c index e09b026ef1..93b253ae14 100644 --- a/lib/se-label.c +++ b/lib/se-label.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define SE_LABEL_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <selinux/label.h> diff --git a/lib/se-selinux.c b/lib/se-selinux.c index a4a3f4d8a8..1b7ad1291a 100644 --- a/lib/se-selinux.c +++ b/lib/se-selinux.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define SE_SELINUX_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <selinux/selinux.h> diff --git a/lib/sig-handler.c b/lib/sig-handler.c index 9ffa5c67a3..45eff61bc6 100644 --- a/lib/sig-handler.c +++ b/lib/sig-handler.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define SIG_HANDLER_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "sig-handler.h" diff --git a/lib/stat-time.c b/lib/stat-time.c index fa93e16cd9..a8ce2fcad9 100644 --- a/lib/stat-time.c +++ b/lib/stat-time.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "stat-time.h" diff --git a/lib/statat.c b/lib/statat.c index b1cfe7cbd9..497bda6a1a 100644 --- a/lib/statat.c +++ b/lib/statat.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define STATAT_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "openat.h" diff --git a/lib/stdc_bit_ceil.c b/lib/stdc_bit_ceil.c index 0d4132fe8f..e4c9064928 100644 --- a/lib/stdc_bit_ceil.c +++ b/lib/stdc_bit_ceil.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_BIT_CEIL_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_bit_floor.c b/lib/stdc_bit_floor.c index 83c189a204..72817e567f 100644 --- a/lib/stdc_bit_floor.c +++ b/lib/stdc_bit_floor.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_BIT_FLOOR_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_bit_width.c b/lib/stdc_bit_width.c index 27fde723f3..0fabf1ba9a 100644 --- a/lib/stdc_bit_width.c +++ b/lib/stdc_bit_width.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_BIT_WIDTH_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_count_ones.c b/lib/stdc_count_ones.c index 76d5dd4645..063619ce77 100644 --- a/lib/stdc_count_ones.c +++ b/lib/stdc_count_ones.c @@ -14,9 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_COUNT_ONES_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> #if 1500 <= _MSC_VER && (defined _M_IX86 || defined _M_X64) diff --git a/lib/stdc_count_zeros.c b/lib/stdc_count_zeros.c index 792fcc9671..2cf10b52de 100644 --- a/lib/stdc_count_zeros.c +++ b/lib/stdc_count_zeros.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_COUNT_ZEROS_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_first_leading_one.c b/lib/stdc_first_leading_one.c index c9f2b473a4..9b30b8773a 100644 --- a/lib/stdc_first_leading_one.c +++ b/lib/stdc_first_leading_one.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_FIRST_LEADING_ONE_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_first_leading_zero.c b/lib/stdc_first_leading_zero.c index ca07a9a7f7..935b1c8fe6 100644 --- a/lib/stdc_first_leading_zero.c +++ b/lib/stdc_first_leading_zero.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_FIRST_LEADING_ZERO_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_first_trailing_one.c b/lib/stdc_first_trailing_one.c index 59ac131e7d..055d95fe44 100644 --- a/lib/stdc_first_trailing_one.c +++ b/lib/stdc_first_trailing_one.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_FIRST_TRAILING_ONE_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_first_trailing_zero.c b/lib/stdc_first_trailing_zero.c index 95d9490eb5..facdd96d70 100644 --- a/lib/stdc_first_trailing_zero.c +++ b/lib/stdc_first_trailing_zero.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_FIRST_TRAILING_ZERO_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_has_single_bit.c b/lib/stdc_has_single_bit.c index 6bd2558002..8d46953fee 100644 --- a/lib/stdc_has_single_bit.c +++ b/lib/stdc_has_single_bit.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_HAS_SINGLE_BIT_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_leading_ones.c b/lib/stdc_leading_ones.c index ab247213e9..aa20ee8b62 100644 --- a/lib/stdc_leading_ones.c +++ b/lib/stdc_leading_ones.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_LEADING_ONES_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_leading_zeros.c b/lib/stdc_leading_zeros.c index 2597c43fc7..3d1e6f6cf1 100644 --- a/lib/stdc_leading_zeros.c +++ b/lib/stdc_leading_zeros.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_LEADING_ZEROS_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_trailing_ones.c b/lib/stdc_trailing_ones.c index 250bfdde3a..3429882e48 100644 --- a/lib/stdc_trailing_ones.c +++ b/lib/stdc_trailing_ones.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_TRAILING_ONES_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/stdc_trailing_zeros.c b/lib/stdc_trailing_zeros.c index 5d5d296c40..12898f8ef2 100644 --- a/lib/stdc_trailing_zeros.c +++ b/lib/stdc_trailing_zeros.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STDC_TRAILING_ZEROS_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <stdbit.h> diff --git a/lib/string-desc-quotearg.c b/lib/string-desc-quotearg.c index d65046f6e2..44247691a6 100644 --- a/lib/string-desc-quotearg.c +++ b/lib/string-desc-quotearg.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_STRING_DESC_QUOTEARG_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "string-desc-quotearg.h" diff --git a/lib/string-desc.c b/lib/string-desc.c index 5dabf67f0d..27947ea4dd 100644 --- a/lib/string-desc.c +++ b/lib/string-desc.c @@ -16,9 +16,8 @@ /* Written by Bruno Haible <[email protected]>, 2023. */ -#include <config.h> - #define GL_STRING_DESC_INLINE _GL_EXTERN_INLINE +#include <config.h> /* Specification and inline definitions. */ #include "string-desc.h" diff --git a/lib/string.c b/lib/string.c index cce2eac9c0..602bb7383e 100644 --- a/lib/string.c +++ b/lib/string.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_STRING_INLINE _GL_EXTERN_INLINE +#include <config.h> #include <string.h> diff --git a/lib/timespec.c b/lib/timespec.c index 9ab11e5cc5..261848d611 100644 --- a/lib/timespec.c +++ b/lib/timespec.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_TIMESPEC_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "timespec.h" diff --git a/lib/u64.c b/lib/u64.c index 9bf45b2912..8cfd7dfdc1 100644 --- a/lib/u64.c +++ b/lib/u64.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define _GL_U64_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "u64.h" + typedef int dummy; diff --git a/lib/utimens.c b/lib/utimens.c index b2c88028c7..5ec77958bb 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -19,10 +19,10 @@ /* derived from a function in touch.c */ +#define _GL_UTIMENS_INLINE _GL_EXTERN_INLINE #include <config.h> /* Specification. */ -#define _GL_UTIMENS_INLINE _GL_EXTERN_INLINE #include "utimens.h" #include <errno.h> diff --git a/lib/xbinary-io.c b/lib/xbinary-io.c index 90e49d99ed..b67d8e10c0 100644 --- a/lib/xbinary-io.c +++ b/lib/xbinary-io.c @@ -14,9 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define XBINARY_IO_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "xbinary-io.h" #include <errno.h> diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 3d84797796..136c5d7ac9 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -15,10 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define XALLOC_INLINE _GL_EXTERN_INLINE - +#include <config.h> #include "xalloc.h" #include "ialloc.h" diff --git a/lib/xsize.c b/lib/xsize.c index cd75b606f2..e9ba2180f4 100644 --- a/lib/xsize.c +++ b/lib/xsize.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define XSIZE_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "xsize.h" diff --git a/lib/xstring-desc.c b/lib/xstring-desc.c index c212c2e76a..384186aceb 100644 --- a/lib/xstring-desc.c +++ b/lib/xstring-desc.c @@ -14,9 +14,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define GL_XSTRING_DESC_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "xstring-desc.h" #include "ialloc.h" diff --git a/lib/xtime.c b/lib/xtime.c index a92d902701..c63bb5e9c7 100644 --- a/lib/xtime.c +++ b/lib/xtime.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <config.h> - #define XTIME_INLINE _GL_EXTERN_INLINE +#include <config.h> #include "xtime.h" -- 2.51.0
