commit 9aa904b04bb8e882432256405a418ba3de7787a9
parent 07c0677b7b96cc69109b8dda9cebd01e62aa2f26
Author: Nicolas Thill <nico@openwrt.org>
Date: Thu, 25 Jun 2015 17:10:31 +0200
libv4l: fix musl compatibility on 64-bits
Signed-off-by: Nicolas Thill <nico@openwrt.org>
Diffstat:
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/libs/libv4l/patches/030-musl_compatibility.patch b/libs/libv4l/patches/030-musl_compatibility.patch
@@ -1,6 +1,6 @@
--- a/lib/libv4lconvert/libv4lsyscall-priv.h
+++ b/lib/libv4lconvert/libv4lsyscall-priv.h
-@@ -35,14 +35,19 @@
+@@ -35,18 +35,23 @@
which is broken on some systems and doesn't include them itself :( */
#ifdef linux
@@ -14,12 +14,16 @@
+#undef SYS_mmap2
#define SYS_mmap2 __NR_mmap2
#define MMAP2_PAGE_SHIFT 12
-+#if !(defined(__UCLIBC__) || defined(__GLIBC__))
-+typedef off_t __off_t;
-+#endif
#else
#define SYS_mmap2 SYS_mmap
#define MMAP2_PAGE_SHIFT 0
+ #endif
++#if !(defined(__UCLIBC__) || defined(__GLIBC__))
++typedef off_t __off_t;
++#endif
+ #endif
+
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--- a/lib/libv4l1/v4l1compat.c
+++ b/lib/libv4l1/v4l1compat.c
@@ -62,7 +62,7 @@ LIBV4L_PUBLIC int open(const char *file,