From: Florian Fainelli <redacted>
Date: Sun, 2 Apr 2017 01:04:03 +0000 (-0700)
Subject: mpack: Fix conflicting malloc definition
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=16750dd412020e7914113acc0664e6ba37f5bbf6;p=openwrt-packages.git

mpack: Fix conflicting malloc definition

Use stdlib.h for malloc(), getenv() and realloc(). Fixes the following
build failure:

unixos.c:42:14: error: conflicting types for 'malloc'
 extern char *malloc();
              ^
Makefile:168: recipe for target 'unixos.o' failed
make[3]: *** [unixos.o] Error 1

Signed-off-by: Florian Fainelli <redacted>
---

diff --git a/utils/mpack/patches/001-use-stdlib.patch b/utils/mpack/patches/001-use-stdlib.patch
new file mode 100644
index 000000000..c5d10df7d
--- /dev/null
+++ b/utils/mpack/patches/001-use-stdlib.patch
@@ -0,0 +1,34 @@
+Index: mpack-1.6/unixos.c
+===================================================================
+--- mpack-1.6.orig/unixos.c
++++ mpack-1.6/unixos.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -39,8 +40,6 @@
+ #endif
+ 
+ extern int errno;
+-extern char *malloc();
+-extern char *getenv();
+ 
+ int overwrite_files = 0;
+ int didchat;
+Index: mpack-1.6/xmalloc.c
+===================================================================
+--- mpack-1.6.orig/xmalloc.c
++++ mpack-1.6/xmalloc.c
+@@ -24,7 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
+-extern char *malloc(), *realloc();
++#include <stdlib.h>
+ 
+ char *xmalloc (int size)
+ {