From: Paul Eggert Date: Tue, 16 Feb 2021 19:41:19 +0000 (-0800) Subject: Port better to macOS Mojave X-Git-Tag: v1.0~3069 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=4b5bc7fdd55da390f486bafa1e91ba93dd8d887f;p=gnulib.git Port better to macOS Mojave Problem reported by Tom Shields in: https://lists.gnu.org/r/bug-gnulib/2021-02/msg00064.html * config/srclist.txt: Comment out dynarray_finalize.c. * lib/dynarray.h (__libc_dynarray_at_failure): Don’t include libc-config.h here, as that’s the includer’s responsibility. * lib/malloc/dynarray_at_failure.c: * lib/malloc/dynarray_emplace_enlarge.c: * lib/malloc/dynarray_finalize.c: * lib/malloc/dynarray_resize.c: * lib/malloc/dynarray_resize_clear.c: If _LIBC is not defined, include libc-config.h. --- diff --git a/ChangeLog b/ChangeLog index 5947755097..000690dd55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2021-02-16 Paul Eggert + + Port better to macOS Mojave + Problem reported by Tom Shields in: + https://lists.gnu.org/r/bug-gnulib/2021-02/msg00064.html + * config/srclist.txt: Comment out dynarray_finalize.c. + * lib/dynarray.h (__libc_dynarray_at_failure): Don’t include + libc-config.h here, as that’s the includer’s responsibility. + * lib/malloc/dynarray_at_failure.c: + * lib/malloc/dynarray_emplace_enlarge.c: + * lib/malloc/dynarray_finalize.c: + * lib/malloc/dynarray_resize.c: + * lib/malloc/dynarray_resize_clear.c: + If _LIBC is not defined, include libc-config.h. + 2021-02-15 Bruno Haible linked-list test: Add test for SIGNAL_SAFE_LIST. (It currently fails.) diff --git a/config/srclist.txt b/config/srclist.txt index d669fd8f01..a55c95f3d9 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -55,7 +55,7 @@ $LIBCSRC include/idx.h lib #$LIBCSRC malloc/dynarray.h lib/malloc #$LIBCSRC malloc/dynarray_at_failure.c lib/malloc #$LIBCSRC malloc/dynarray_emplace_enlarge.c lib/malloc -$LIBCSRC malloc/dynarray_finalize.c lib/malloc +#$LIBCSRC malloc/dynarray_finalize.c lib/malloc #$LIBCSRC malloc/dynarray_resize.c lib/malloc #$LIBCSRC malloc/dynarray_resize_clear.c lib/malloc $LIBCSRC include/scratch_buffer.h lib/malloc diff --git a/lib/dynarray.h b/lib/dynarray.h index 6da3e87e55..37053d0fac 100644 --- a/lib/dynarray.h +++ b/lib/dynarray.h @@ -19,8 +19,6 @@ #ifndef _GL_DYNARRAY_H #define _GL_DYNARRAY_H -#include - #define __libc_dynarray_at_failure gl_dynarray_at_failure #define __libc_dynarray_emplace_enlarge gl_dynarray_emplace_enlarge #define __libc_dynarray_finalize gl_dynarray_finalize diff --git a/lib/malloc/dynarray_at_failure.c b/lib/malloc/dynarray_at_failure.c index 0fa12c7cd1..4f840db7c5 100644 --- a/lib/malloc/dynarray_at_failure.c +++ b/lib/malloc/dynarray_at_failure.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +#ifndef _LIBC +# include +#endif + #include #include #include diff --git a/lib/malloc/dynarray_emplace_enlarge.c b/lib/malloc/dynarray_emplace_enlarge.c index ddfe306fcd..0f8baf94ad 100644 --- a/lib/malloc/dynarray_emplace_enlarge.c +++ b/lib/malloc/dynarray_emplace_enlarge.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +#ifndef _LIBC +# include +#endif + #include #include #include diff --git a/lib/malloc/dynarray_finalize.c b/lib/malloc/dynarray_finalize.c index 8ec6ad2bcc..c33da41389 100644 --- a/lib/malloc/dynarray_finalize.c +++ b/lib/malloc/dynarray_finalize.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +#ifndef _LIBC +# include +#endif + #include #include #include diff --git a/lib/malloc/dynarray_resize.c b/lib/malloc/dynarray_resize.c index 5c60927f37..5a57166a84 100644 --- a/lib/malloc/dynarray_resize.c +++ b/lib/malloc/dynarray_resize.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +#ifndef _LIBC +# include +#endif + #include #include #include diff --git a/lib/malloc/dynarray_resize_clear.c b/lib/malloc/dynarray_resize_clear.c index e893d1d58e..9c43b00c3a 100644 --- a/lib/malloc/dynarray_resize_clear.c +++ b/lib/malloc/dynarray_resize_clear.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +#ifndef _LIBC +# include +#endif + #include #include