diff options
author | Daniel Llorens <lloda@sarc.name> | 2021-08-16 13:23:27 +0200 |
---|---|---|
committer | Daniel Llorens <lloda@sarc.name> | 2021-08-16 13:23:27 +0200 |
commit | b4a80f4239b19fea4d2cc3e9d197f24b809f0624 (patch) | |
tree | b4dc728ec96391e302df4f7c733bf592a3976ff2 /lib/dynarray.h | |
parent | 5df5555d12f1408a66a5368a918abb981edf5445 (diff) | |
download | guile-b4a80f4239b19fea4d2cc3e9d197f24b809f0624.tar.gz |
Update gnulib to 8f4538a53d64054ae2fc8b86c0f87c418c6176e6
Includes gnulib:0c907f7da13232908f05c415b8cec56024071906 to fix #49930
https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html.
Diffstat (limited to 'lib/dynarray.h')
-rw-r--r-- | lib/dynarray.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/dynarray.h b/lib/dynarray.h index 5db6ed95b..ec64273b3 100644 --- a/lib/dynarray.h +++ b/lib/dynarray.h @@ -1,12 +1,12 @@ /* Type-safe arrays which grow dynamically. Copyright 2021 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -257,18 +257,22 @@ static DYNARRAY_ELEMENT * #if defined DYNARRAY_STRUCT || defined DYNARRAY_ELEMENT || defined DYNARRAY_PREFIX -# include <libc-config.h> +# ifndef _GL_LIKELY +/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ +# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) +# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) +# endif /* Define auxiliary structs and declare auxiliary functions, common to all instantiations of dynarray. */ -# include <malloc/dynarray.h> +# include <malloc/dynarray.gl.h> /* Define the instantiation, specified through DYNARRAY_STRUCT DYNARRAY_ELEMENT DYNARRAY_PREFIX etc. */ -# include <malloc/dynarray-skeleton.c> +# include <malloc/dynarray-skeleton.gl.h> #else |