From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DBD5D492C0 for ; Tue, 7 May 2024 21:50:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F84F68D4BA; Wed, 8 May 2024 00:50:01 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4EF268D3DB for ; Wed, 8 May 2024 00:49:54 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 7E6C5EA5CB for ; Tue, 7 May 2024 23:49:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cqBPG7rqyqUQ for ; Tue, 7 May 2024 23:49:51 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 9B349EA5CA for ; Tue, 7 May 2024 23:49:51 +0200 (CEST) Date: Tue, 7 May 2024 23:49:51 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: Message-ID: References: MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] lavd/v4l2: Use proper field type for second parameter of ioctl() with BSD's X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sun, 5 May 2024, Brad Smith wrote: > lavd/v4l2: Use proper field type for second parameter of ioctl() with BSD's > > The proper type was used until 73251678c83cbe24d08264da693411b166239bc7. > > This covers all of the OS's that currently have V4L2 support, permutations > of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris. > > Copied from FreeBSD ports patch. > > Signed-off-by: Brad Smith > --- > libavdevice/v4l2.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c > index 3706582bc6..74f43ef6a9 100644 > --- a/libavdevice/v4l2.c > +++ b/libavdevice/v4l2.c > @@ -108,10 +108,10 @@ struct video_data { > int (*open_f)(const char *file, int oflag, ...); > int (*close_f)(int fd); > int (*dup_f)(int fd); > -#ifdef __GLIBC__ > - int (*ioctl_f)(int fd, unsigned long int request, ...); > -#else > +#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */ > int (*ioctl_f)(int fd, int request, ...); > +#else > + int (*ioctl_f)(int fd, unsigned long int request, ...); > #endif > ssize_t (*read_f)(int fd, void *buffer, size_t n); > void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset); Will apply. Thanks, Marton _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".