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 327AF45CB9 for ; Thu, 31 Aug 2023 20:55:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E029368C7EA; Thu, 31 Aug 2023 23:55:12 +0300 (EEST) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5051768C6CB for ; Thu, 31 Aug 2023 23:55:06 +0300 (EEST) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 37VKt3ct013958-37VKt3cu013958; Thu, 31 Aug 2023 23:55:03 +0300 Received: from foo.martin.st (host-97-144.parnet.fi [77.234.97.144]) by mail9.parnet.fi (Postfix) with ESMTPS id 68A67A1482; Thu, 31 Aug 2023 23:55:03 +0300 (EEST) Date: Thu, 31 Aug 2023 23:55:01 +0300 (EEST) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: Message-ID: <52df9a8f-1d85-5f85-f172-d2e7d7fd5da6@martin.st> References: MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH] avformat/internal: Don't auto-include os_support.h 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 Cc: Andreas Rheinhardt 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 Thu, 31 Aug 2023, Andreas Rheinhardt wrote: > It includes various Windows-specific headers when compiling > for Windows and these sometimes cause issues: E.g. winbase.h > defines IGNORE, which clashes with a macro used in the Matroska > muxer (since 884653ee5be03ed38db957c14fad51b300611c8c) and demuxer. > > This header provides fallback defines for various stuff that is > mostly not used directly by (de)muxers at all: > mkdir, rename, rmdir, unlink, access, poll, pollfd, nfds_t, > closesocket, socklen_t, fstat, stat, lseek, SHUT_(RD|WR|RDWR) > and various POLL* constants. > > Ergo fix this issue by not auto-including this header in lots > of places via an inclusion in internal.h and instead include > it everywhere where the above stuff is used (most of these > translation units already included os_support.h). > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/img2dec.c | 1 + > libavformat/internal.h | 1 - > libavformat/rtsp.h | 1 + > libavformat/utils.c | 1 + > 4 files changed, 3 insertions(+), 1 deletion(-) Ok with me, if you did a reasonable effort to check that this covers all the cases of the redirected functions. Spreading those includes everywhere isn't very nice indeed. This increases the risk of accidentally adding new uses of these functions without picking up the redirects, but I guess that's manageable. // Martin _______________________________________________ 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".