]> Savannah Git Hosting - gnulib.git/commitdiff
Port better to macOS Mojave
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Feb 2021 19:41:19 +0000 (11:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Feb 2021 19:42:07 +0000 (11:42 -0800)
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.

ChangeLog
config/srclist.txt
lib/dynarray.h
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

index 5947755097fb0a6a2d4b6b4f9ac9a106153b9ac1..000690dd551811a8b20f723c94cfca2731063229 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2021-02-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       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  <bruno@clisp.org>
 
        linked-list test: Add test for SIGNAL_SAFE_LIST. (It currently fails.)
index d669fd8f01f089acd67e373d14e3442315f369b0..a55c95f3d97e9bafffe9c2eb8061751e7606d467 100644 (file)
@@ -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
index 6da3e87e55f1336df5fec418f2120df697d2810c..37053d0fac609ccbb9d89a89e99f6c09918156fa 100644 (file)
@@ -19,8 +19,6 @@
 #ifndef _GL_DYNARRAY_H
 #define _GL_DYNARRAY_H
 
-#include <libc-config.h>
-
 #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
index 0fa12c7cd169a1c1be183bc9fdde273c5760b0c1..4f840db7c5edcf1072b452b2c1dfa3cd22b6a655 100644 (file)
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <dynarray.h>
 #include <stdio.h>
 #include <stdlib.h>
index ddfe306fcd855fb7dd172d0babefc6f43e13956b..0f8baf94ad17a7eee23a44ec50c2d704818cde1d 100644 (file)
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <dynarray.h>
 #include <errno.h>
 #include <intprops.h>
index 8ec6ad2bccc700a20aad3c47bb823ffa430ac5e3..c33da41389ed51a535c329808d2c6b5c256c4f90 100644 (file)
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <dynarray.h>
 #include <stdlib.h>
 #include <string.h>
index 5c60927f37f7718a095e870bbfc293892d7be9d0..5a57166a8498fba9739abedf3b892c1e7017c0df 100644 (file)
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <dynarray.h>
 #include <errno.h>
 #include <intprops.h>
index e893d1d58e78e224aa88c9d9ccb1ddd883b6007f..9c43b00c3a7952c75a504d4b03ddbc1d5c241e1c 100644 (file)
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <dynarray.h>
 #include <string.h>