Em Sun, 25 Jan 2015 21:36:15 +0100
Felix Janda <felix.janda@xxxxxxxxx> escreveu:
> Since _LARGEFILE64_SOURCE is 1, these types coincide if defined.
The __off_t macro was also added by the FreeBSD patchset. Removing this
will likely break for FreeBSD.
So, provided that this is not causing any issues, better to keep it
as-is.
Regards,
Mauro
>
> Signed-off-by: Felix Janda <felix.janda@xxxxxxxxx>
> ---
> lib/libv4l1/v4l1compat.c | 5 ++---
> lib/libv4l2/v4l2convert.c | 4 ++--
> lib/libv4lconvert/libv4lsyscall-priv.h | 7 +++----
> 3 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c
> index e328288..07240c1 100644
> --- a/lib/libv4l1/v4l1compat.c
> +++ b/lib/libv4l1/v4l1compat.c
> @@ -26,7 +26,6 @@
> #include <stdarg.h>
> #include <fcntl.h>
> #include <libv4l1.h>
> -#include "../libv4lconvert/libv4lsyscall-priv.h" /* for __off_t */
>
> #include <sys/ioctl.h>
> #include <sys/mman.h>
> @@ -112,14 +111,14 @@ LIBV4L_PUBLIC ssize_t read(int fd, void *buffer, size_t n)
> }
>
> LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd,
> - __off_t offset)
> + off_t offset)
> {
> return v4l1_mmap(start, length, prot, flags, fd, offset);
> }
>
> #ifdef linux
> LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
> - __off64_t offset)
> + off64_t offset)
> {
> return v4l1_mmap(start, length, prot, flags, fd, offset);
> }
> diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c
> index 9b46ab8..b65da5e 100644
> --- a/lib/libv4l2/v4l2convert.c
> +++ b/lib/libv4l2/v4l2convert.c
> @@ -139,14 +139,14 @@ LIBV4L_PUBLIC ssize_t read(int fd, void *buffer, size_t n)
> }
>
> LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd,
> - __off_t offset)
> + off_t offset)
> {
> return v4l2_mmap(start, length, prot, flags, fd, offset);
> }
>
> #ifdef linux
> LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
> - __off64_t offset)
> + off64_t offset)
> {
> return v4l2_mmap(start, length, prot, flags, fd, offset);
> }
> diff --git a/lib/libv4lconvert/libv4lsyscall-priv.h b/lib/libv4lconvert/libv4lsyscall-priv.h
> index cdd38bc..ce89073 100644
> --- a/lib/libv4lconvert/libv4lsyscall-priv.h
> +++ b/lib/libv4lconvert/libv4lsyscall-priv.h
> @@ -59,7 +59,6 @@
> #define _IOC_SIZE(cmd) IOCPARM_LEN(cmd)
> #define MAP_ANONYMOUS MAP_ANON
> #define MMAP2_PAGE_SHIFT 0
> -typedef off_t __off_t;
> #endif
>
> #undef SYS_OPEN
> @@ -91,15 +90,15 @@ typedef off_t __off_t;
> #if defined(__FreeBSD__)
> #define SYS_MMAP(addr, len, prot, flags, fd, off) \
> __syscall(SYS_mmap, (void *)(addr), (size_t)(len), \
> - (int)(prot), (int)(flags), (int)(fd), (__off_t)(off))
> + (int)(prot), (int)(flags), (int)(fd), (off_t)(off))
> #elif defined(__FreeBSD_kernel__)
> #define SYS_MMAP(addr, len, prot, flags, fd, off) \
> syscall(SYS_mmap, (void *)(addr), (size_t)(len), \
> - (int)(prot), (int)(flags), (int)(fd), (__off_t)(off))
> + (int)(prot), (int)(flags), (int)(fd), (off_t)(off))
> #else
> #define SYS_MMAP(addr, len, prot, flags, fd, off) \
> syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
> - (int)(prot), (int)(flags), (int)(fd), (__off_t)((off) >> MMAP2_PAGE_SHIFT))
> + (int)(prot), (int)(flags), (int)(fd), (off_t)((off) >> MMAP2_PAGE_SHIFT))
> #endif
>
> #define SYS_MUNMAP(addr, len) \
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
