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/scratch_buffer.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/scratch_buffer.h')
-rw-r--r-- | lib/scratch_buffer.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h index 4b17f72ea..88735771d 100644 --- a/lib/scratch_buffer.h +++ b/lib/scratch_buffer.h @@ -1,12 +1,12 @@ /* Variable-sized buffer with on-stack default allocation. Copyright (C) 2017-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. @@ -110,14 +110,18 @@ extern void *scratch_buffer_dupfree (struct scratch_buffer *buffer, /* The implementation is imported from glibc. */ -#include <libc-config.h> - /* Avoid possible conflicts with symbols exported by the GNU libc. */ #define __libc_scratch_buffer_dupfree gl_scratch_buffer_dupfree #define __libc_scratch_buffer_grow gl_scratch_buffer_grow #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size -#include <malloc/scratch_buffer.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 + +#include <malloc/scratch_buffer.gl.h> #endif /* _GL_SCRATCH_BUFFER_H */ |