From fbc5bcf37a8acf1710b8bc3c0dc813531f36206d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 31 Jul 2022 23:48:14 +0200 Subject: [PATCH] avltree-omap, avltree-oset, avltreehash-list, rbtree-omap: Pacify GCC. * lib/gl_avltree_omap.c (gl_avltree_omap_check_invariants): Add extern decl. * lib/gl_avltree_oset.c (gl_avltree_oset_check_invariants): Likewise. * lib/gl_avltreehash_list.c (gl_avltreehash_list_check_invariants): Likewise. * lib/gl_rbtree_omap.c (gl_rbtree_omap_check_invariants): Likewise. --- ChangeLog | 14 ++++++++++++-- lib/gl_avltree_list.c | 3 +-- lib/gl_avltree_omap.c | 1 + lib/gl_avltree_oset.c | 1 + lib/gl_avltreehash_list.c | 1 + lib/gl_rbtree_list.c | 3 +-- lib/gl_rbtree_omap.c | 1 + 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39405211ed..87c134d03f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,21 @@ +2022-07-31 Bruno Haible + + avltree-omap, avltree-oset, avltreehash-list, rbtree-omap: Pacify GCC. + * lib/gl_avltree_omap.c (gl_avltree_omap_check_invariants): Add extern + decl. + * lib/gl_avltree_oset.c (gl_avltree_oset_check_invariants): Likewise. + * lib/gl_avltreehash_list.c (gl_avltreehash_list_check_invariants): + Likewise. + * lib/gl_rbtree_omap.c (gl_rbtree_omap_check_invariants): Likewise. + 2022-07-31 Paul Eggert - rbtree-oset: Pacify GCC + rbtree-oset, rbtreehash-list: Pacify GCC * lib/gl_rbtree_oset.c (gl_rbtree_oset_check_invariants): * lib/gl_rbtreehash_list.c (gl_rbtreehash_list_check_invariants): Add extern decls, to pacify --enable-gcc-warnings with Bison. -2022-07-06 Akim Demaille +2022-07-31 Akim Demaille gnulib-tool: add support for --automake-subdir-tests diff --git a/lib/gl_avltree_list.c b/lib/gl_avltree_list.c index 4d26079673..828286e991 100644 --- a/lib/gl_avltree_list.c +++ b/lib/gl_avltree_list.c @@ -37,8 +37,6 @@ #include "gl_anytree_list2.h" /* For debugging. */ -extern void gl_avltree_list_check_invariants (gl_list_t list); - static unsigned int _GL_ATTRIBUTE_PURE check_invariants (gl_list_node_t node, gl_list_node_t parent) { @@ -61,6 +59,7 @@ check_invariants (gl_list_node_t node, gl_list_node_t parent) return 1 + (left_height > right_height ? left_height : right_height); } +extern void gl_avltree_list_check_invariants (gl_list_t list); void gl_avltree_list_check_invariants (gl_list_t list) { diff --git a/lib/gl_avltree_omap.c b/lib/gl_avltree_omap.c index faa9c7e3c9..d0e0c71dae 100644 --- a/lib/gl_avltree_omap.c +++ b/lib/gl_avltree_omap.c @@ -48,6 +48,7 @@ #include "gl_anytree_omap.h" /* For debugging. */ +extern void gl_avltree_omap_check_invariants (gl_omap_t); void gl_avltree_omap_check_invariants (gl_omap_t map) { diff --git a/lib/gl_avltree_oset.c b/lib/gl_avltree_oset.c index b1ded032e2..54f5a512cc 100644 --- a/lib/gl_avltree_oset.c +++ b/lib/gl_avltree_oset.c @@ -46,6 +46,7 @@ #include "gl_anytree_oset.h" /* For debugging. */ +extern void gl_avltree_oset_check_invariants (gl_oset_t); void gl_avltree_oset_check_invariants (gl_oset_t set) { diff --git a/lib/gl_avltreehash_list.c b/lib/gl_avltreehash_list.c index bd8edcbe40..a570acbec8 100644 --- a/lib/gl_avltreehash_list.c +++ b/lib/gl_avltreehash_list.c @@ -83,6 +83,7 @@ check_invariants (gl_list_node_t node, gl_list_node_t parent) return 1 + (left_height > right_height ? left_height : right_height); } +extern void gl_avltreehash_list_check_invariants (gl_list_t); void gl_avltreehash_list_check_invariants (gl_list_t list) { diff --git a/lib/gl_rbtree_list.c b/lib/gl_rbtree_list.c index a7c35158c6..660783ecc1 100644 --- a/lib/gl_rbtree_list.c +++ b/lib/gl_rbtree_list.c @@ -37,8 +37,6 @@ #include "gl_anytree_list2.h" /* For debugging. */ -extern void gl_rbtree_list_check_invariants (gl_list_t list); - static unsigned int check_invariants (gl_list_node_t node, gl_list_node_t parent) { @@ -62,6 +60,7 @@ check_invariants (gl_list_node_t node, gl_list_node_t parent) return left_blackheight + (node->color == BLACK ? 1 : 0); } +extern void gl_rbtree_list_check_invariants (gl_list_t list); void gl_rbtree_list_check_invariants (gl_list_t list) { diff --git a/lib/gl_rbtree_omap.c b/lib/gl_rbtree_omap.c index 72ab0b33ad..4a532d8ffd 100644 --- a/lib/gl_rbtree_omap.c +++ b/lib/gl_rbtree_omap.c @@ -48,6 +48,7 @@ #include "gl_anytree_omap.h" /* For debugging. */ +extern void gl_rbtree_omap_check_invariants (gl_omap_t); void gl_rbtree_omap_check_invariants (gl_omap_t map) { -- 2.39.5