From: Alexandros C. Couloumbis <alex@ozo.com>
Date: Mon, 3 Jan 2011 14:27:53 +0000 (+0000)
Subject: tools/mkimage: fix r24887
X-Git-Tag: reboot~17929
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d6b2ce5df5a969ddc7f9737308eba369da4bfa74;p=openwrt%2Fstaging%2Flynxis.git

tools/mkimage: fix r24887

SVN-Revision: 24890
---

diff --git a/tools/mkimage/patches/100-portability.patch b/tools/mkimage/patches/100-portability.patch
deleted file mode 100644
index 052a584cbb..0000000000
--- a/tools/mkimage/patches/100-portability.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/tools/kwbimage.c
-+++ b/tools/kwbimage.c
-@@ -206,6 +206,30 @@ INVL_DATA:
- 	exit (EXIT_FAILURE);
- }
- 
-+#ifndef __GLIBC__
-+#ifndef __FreeBSD__
-+static ssize_t
-+getline(char **line, size_t *len, FILE *fd)
-+{
-+	char *tmp;
-+	int tmplen;
-+
-+	tmp = fgetln(fd, &tmplen);
-+	if (!tmp)
-+		return -1;
-+
-+	if (!*line || tmplen > *len) {
-+		*len = tmplen + 1;
-+		*line = realloc(*line, *len);
-+	}
-+
-+	strncpy(*line, tmp, tmplen);
-+	line[tmplen] = 0;
-+	return tmplen;
-+}
-+#endif
-+#endif
-+
- /*
-  * this function sets the kwbimage header by-
-  * 	1. Abstracting input command line arguments data
---- a/include/image.h
-+++ b/include/image.h
-@@ -50,6 +50,10 @@
- 
- #endif /* USE_HOSTCC */
- 
-+#ifndef ulong
-+#define ulong unsigned long
-+#endif
-+
- #if defined(CONFIG_FIT)
- #include <fdt.h>
- #include <libfdt.h>