logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0006-Revert-lavd-v4l2-Use-proper-field-type-for-second-pa.patch (1133B)


  1. From 79f1d1f2e080eb37540083381194751b15d50976 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Wed, 14 Aug 2024 17:15:05 -0700
  4. Subject: [PATCH] Revert "lavd/v4l2: Use proper field type for second parameter
  5. of ioctl() with BSD's"
  6. This reverts commit 6ab65792ab8e522f5a8a9f432ca11900f35a9d94.
  7. ---
  8. libavdevice/v4l2.c | 6 +++---
  9. 1 file changed, 3 insertions(+), 3 deletions(-)
  10. diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
  11. index 50ac47ec5a..51291246b3 100644
  12. --- a/libavdevice/v4l2.c
  13. +++ b/libavdevice/v4l2.c
  14. @@ -107,10 +107,10 @@ struct video_data {
  15. int (*open_f)(const char *file, int oflag, ...);
  16. int (*close_f)(int fd);
  17. int (*dup_f)(int fd);
  18. -#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
  19. - int (*ioctl_f)(int fd, int request, ...);
  20. -#else
  21. +#ifdef __GLIBC__
  22. int (*ioctl_f)(int fd, unsigned long int request, ...);
  23. +#else
  24. + int (*ioctl_f)(int fd, int request, ...);
  25. #endif
  26. ssize_t (*read_f)(int fd, void *buffer, size_t n);
  27. void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
  28. --
  29. 2.44.0