diff options
author | 2015-11-18 23:24:32 +0000 | |
---|---|---|
committer | 2015-12-12 23:31:44 +0000 | |
commit | 9a4ab3b1ad45a556b845530a12ec865be2278c78 (patch) | |
tree | b52995222684153eae81e9b7fee53bf885fcb713 /meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch | |
parent | 87376746d64aea47cce327d951692c31d4acf872 (diff) | |
download | openembedded-core-9a4ab3b1ad45a556b845530a12ec865be2278c78.tar.gz |
mtd-utils: Backport and create patches to support musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch')
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch b/meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch new file mode 100644 index 0000000000..46ed956d0e --- /dev/null +++ b/meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch @@ -0,0 +1,56 @@ +From 26cc709291fc6c5d2e45b26c602407706d9142df Mon Sep 17 00:00:00 2001 +From: Imre Kaloz <kaloz@openwrt.org> +Date: Mon, 4 May 2015 15:36:34 +0200 +Subject: [PATCH] mtd-utils: libfec: use standard C type instead of u_long + +Fixes compilation on hosts with the musl C library. +Also drops the unused u_short typedef. + +Signed-off-by: Imre Kaloz <kaloz@openwrt.org> +Signed-off-by: Brian Norris <computersforpeace@gmail.com> +--- +Upstream-Status: Backport + + lib/libfec.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/lib/libfec.c b/lib/libfec.c +index ff5a127..bf68381 100644 +--- a/lib/libfec.c ++++ b/lib/libfec.c +@@ -61,8 +61,6 @@ struct timeval { + }; + #define gettimeofday(x, dummy) { (x)->ticks = clock() ; } + #define DIFF_T(a,b) (1+ 1000000*(a.ticks - b.ticks) / CLOCKS_PER_SEC ) +-typedef unsigned long u_long ; +-typedef unsigned short u_short ; + #else /* typically, unix systems */ + #include <sys/time.h> + #define DIFF_T(a,b) \ +@@ -75,12 +73,12 @@ typedef unsigned short u_short ; + t = x.tv_usec + 1000000* (x.tv_sec & 0xff ) ; \ + } + #define TOCK(t) \ +- { u_long t1 ; TICK(t1) ; \ ++ { unsigned long t1 ; TICK(t1) ; \ + if (t1 < t) t = 256000000 + t1 - t ; \ + else t = t1 - t ; \ + if (t == 0) t = 1 ;} + +-u_long ticks[10]; /* vars for timekeeping */ ++unsigned long ticks[10]; /* vars for timekeeping */ + #else + #define DEB(x) + #define DDB(x) +@@ -625,7 +623,7 @@ init_fec(void) + #define FEC_MAGIC 0xFECC0DEC + + struct fec_parms { +- u_long magic ; ++ unsigned long magic ; + int k, n ; /* parameters of the code */ + gf *enc_matrix ; + } ; +-- +2.6.0 + |