Fixed some C++ compilation issues.

diff --git a/mapping.h b/mapping.h
index 3b930132c755e61f49e3abd64773a160b6ae153e..2eb53d05da816076bd4a6f1ab6d0ea18f82826ac 100644 (file)
--- a/mapping.h
+++ b/mapping.h
@@ -47,6 +47,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include "minimal/stdlib.h"
+
 void *map(const char *path, size_t offset, size_t size, size_t *psize, bool ro) {
     int fd;
     _syscall(fd = open(path, ro ? O_RDONLY : O_RDWR));

diff --git a/string.h b/string.h
index b304134954d3fd6c48ab1898c3e7262c58e51370..c6ebe8bfb51b6408cdbbbfd8df6ac9846c8c3016 100644 (file)
--- a/string.h
+++ b/string.h
@@ -41,7 +41,7 @@
 #include <string.h>
 
 _disused static char *strndup_(const char *src, int len) {
-    char *dst = malloc(len + 1);
+    char *dst = (char *) malloc(len + 1);
     _assert(dst != NULL);
     strncpy(dst, src, len);
     dst[len] = '\0';