summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2021-12-10 11:41:52 -0600
committerTimo Teräs <timo.teras@iki.fi>2021-12-14 20:59:54 +0200
commitbf659c82465860b58b1ef8fee5cd8b6c3cade2a5 (patch)
tree3a14cac2efd6136e27edf720d2787701436c99e7
parent676c0a40a66e3488c803fe7ddbfb50a33a52fb21 (diff)
downloadapk-tools-bf659c82465860b58b1ef8fee5cd8b6c3cade2a5.tar.gz
apk-tools-bf659c82465860b58b1ef8fee5cd8b6c3cade2a5.tar.bz2
apk-tools-bf659c82465860b58b1ef8fee5cd8b6c3cade2a5.tar.xz
apk-tools-bf659c82465860b58b1ef8fee5cd8b6c3cade2a5.zip
everywhere: use stdlib.h for malloc(3) definition, not GNU-specific malloc.h
musl implements support for malloc.h, but it is only a stub. we do not use any of the GNU-specific malloc interfaces, so just use POSIX stdlib.h instead. ref #10794
-rw-r--r--src/blob.c2
-rw-r--r--src/common.c1
-rw-r--r--src/database.c1
-rw-r--r--src/io.c1
-rw-r--r--src/io_gunzip.c1
-rw-r--r--src/package.c1
-rw-r--r--src/print.c1
7 files changed, 1 insertions, 7 deletions
diff --git a/src/blob.c b/src/blob.c
index 1a63686..58325b8 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -7,7 +7,7 @@
* SPDX-License-Identifier: GPL-2.0-only
*/
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/src/common.c b/src/common.c
index 580e6d5..2b0fe7e 100644
--- a/src/common.c
+++ b/src/common.c
@@ -6,7 +6,6 @@
* SPDX-License-Identifier: GPL-2.0-only
*/
-#include <malloc.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/database.c b/src/database.c
index d0f064d..b8aa643 100644
--- a/src/database.c
+++ b/src/database.c
@@ -14,7 +14,6 @@
#include <libgen.h>
#include <limits.h>
#include <unistd.h>
-#include <malloc.h>
#include <string.h>
#include <stdlib.h>
#include <signal.h>
diff --git a/src/io.c b/src/io.c
index 22ef386..ecb3898 100644
--- a/src/io.c
+++ b/src/io.c
@@ -12,7 +12,6 @@
#include <fcntl.h>
#include <endian.h>
#include <unistd.h>
-#include <malloc.h>
#include <dirent.h>
#include <stdint.h>
#include <sys/mman.h>
diff --git a/src/io_gunzip.c b/src/io_gunzip.c
index 554a95a..9ffc060 100644
--- a/src/io_gunzip.c
+++ b/src/io_gunzip.c
@@ -10,7 +10,6 @@
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
-#include <malloc.h>
#include <zlib.h>
#include "apk_defines.h"
diff --git a/src/package.c b/src/package.c
index c068b8d..eba1b2b 100644
--- a/src/package.c
+++ b/src/package.c
@@ -12,7 +12,6 @@
#include <ctype.h>
#include <stdio.h>
#include <limits.h>
-#include <malloc.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/print.c b/src/print.c
index 5be5460..23f4614 100644
--- a/src/print.c
+++ b/src/print.c
@@ -11,7 +11,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <malloc.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/types.h>