aboutsummaryrefslogtreecommitdiffstats
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
commit9c1e174dedae8b29f82db95cf8e420289880d9ce (patch)
treeb7208954fd8dc2644213eb8bc7697087a71669b6
parent6a285bfb8c65e74289b653c3ebe88a6e07928029 (diff)
downloadupstream-9c1e174dedae8b29f82db95cf8e420289880d9ce.tar.gz
upstream-9c1e174dedae8b29f82db95cf8e420289880d9ce.tar.bz2
upstream-9c1e174dedae8b29f82db95cf8e420289880d9ce.zip
tools/mkimage: fix r24887
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24890 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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>