From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id 272EF46104
	for <ffmpegdev@gitmailbox.com>; Fri,  4 Aug 2023 12:40:02 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8CE2868C5B3;
	Fri,  4 Aug 2023 15:40:00 +0300 (EEST)
Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2B2668C1EB
 for <ffmpeg-devel@ffmpeg.org>; Fri,  4 Aug 2023 15:39:53 +0300 (EEST)
Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21])
 by mail8.parnet.fi  with ESMTP id 374CdrLt009856-374CdrLu009856
 for <ffmpeg-devel@ffmpeg.org>; Fri, 4 Aug 2023 15:39:53 +0300
Received: from foo.martin.st (host-97-144.parnet.fi [77.234.97.144])
 by mail9.parnet.fi (Postfix) with ESMTPS id 38A5BA146D
 for <ffmpeg-devel@ffmpeg.org>; Fri,  4 Aug 2023 15:39:53 +0300 (EEST)
Date: Fri, 4 Aug 2023 15:39:52 +0300 (EEST)
From: =?ISO-8859-15?Q?Martin_Storsj=F6?= <martin@martin.st>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
In-Reply-To: <feb15e1-6dfa-2a76-bcf9-308b9a189dbc@martin.st>
Message-ID: <a0a6d487-cfd2-382e-d4a5-28fe1ce5f74c@martin.st>
References: <f4740c20-da0f-4f98-87ab-79407d41e7ef@amyspark.me>
 <feb15e1-6dfa-2a76-bcf9-308b9a189dbc@martin.st>
MIME-Version: 1.0
X-FE-Policy-ID: 3:14:2:SYSTEM
X-Content-Filtered-By: Mailman/MimeDel 2.1.29
Subject: Re: [FFmpeg-devel] [PATCH] os_support,
 network: Fix build failure on Windows with BZIP2
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="iso-8859-15"; Format="flowed"
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/a0a6d487-cfd2-382e-d4a5-28fe1ce5f74c@martin.st/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

On Fri, 4 Aug 2023, Martin Storsj=F6 wrote:

> On Thu, 27 Jul 2023, L. E. Segovia wrote:
>
>> Including winsock2.h without WIN32_LEAN_AND_MEAN causes bzlib.h to parse
>> as nonsense, due to an instance of #define char small in rpcndr.h
>> (included transitively from windows.h).
>> =

>> See: https://stackoverflow.com/a/27794577
>> Signed-off-by: L. E. Segovia <amy@amyspark.me>
>> ---
>> libavformat/network.h    | 1 +
>> libavformat/os_support.c | 6 ++----
>> libavformat/os_support.h | 1 +
>> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> The change looks mostly reasonable to me I think, and WIN32_LEAN_AND_MEAN=
 is =

> generally beneficial. I've got a couple comments below though.

Alternatively, I guess we could consider adding WIN32_LEAN_AND_MEAN in =

configure somewhere instead? That way we don't need to hunt down any =

potential stray includes of windows.h/winsock2.h if they are added =

elsewhere.

// 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".