aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2011-01-03 14:27:53 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2011-01-03 14:27:53 +0000
commitd6b2ce5df5a969ddc7f9737308eba369da4bfa74 (patch)
treec8e9cef1e8f638f6bcf1bc722704378ab3396935 /tools/mkimage
parent5428a582875659391c2397fe4bc8da14e9757704 (diff)
downloadupstream-d6b2ce5df5a969ddc7f9737308eba369da4bfa74.tar.gz
upstream-d6b2ce5df5a969ddc7f9737308eba369da4bfa74.tar.bz2
upstream-d6b2ce5df5a969ddc7f9737308eba369da4bfa74.zip
tools/mkimage: fix r24887
SVN-Revision: 24890
Diffstat (limited to 'tools/mkimage')
-rw-r--r--tools/mkimage/patches/100-portability.patch46
1 files changed, 0 insertions, 46 deletions
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>