From patchwork Sat Aug 5 20:47:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. E. Segovia" X-Patchwork-Id: 43133 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp770313pzh; Sat, 5 Aug 2023 13:47:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERHan/rNj0hAszIUjueCgRipBmYwEOmQpCYTViprHGSJ+CK3OtgwFDCB3pkdfvTan1OslJ X-Received: by 2002:a17:906:49:b0:993:d53b:9805 with SMTP id 9-20020a170906004900b00993d53b9805mr5133266ejg.11.1691268459842; Sat, 05 Aug 2023 13:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691268459; cv=none; d=google.com; s=arc-20160816; b=IBNLA8QSK8v7VZJp/c8KZ9rXDjtJg03JvrwuHAtuO9CZ+JE1qHNuGviY/MnZiZeEhB GXotoA0wtCTF5katq4ct6wd1mXLjk3Wbm5lv0w5+TXCXPZUuQK0IQ8aw+obCDdJJynnT F0/hoATA+1/NnhTYBU60ClHM+ezwQzfauNGuJh23fuOhrSKlhwRdALl4/hNAkJG8GpPG xXESEH5FDHw9OKCcWEV0+7ouFYjE3X/+7vHB3CCeVJ/Ht09/OWwyUsR4PB0mEBi2yia0 FQe1Uxe7IxvK3eNi+KnWj4GecqaI/aOMeMxJgoqE/Zff3wMI0XZ13TViSu8GUyUuZJnw tHag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:in-reply-to:content-language:references:to:from :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=7kJQXEuag8Hsu7J6MCK8w0TCeDjYPPFgno5ADEVLv24=; fh=ESc3qdU44dcJCICb6LyFA8dwP9m5t2kvrhWue0vN394=; b=bNGHSPCbqLSx3kZys04uzn2twPyKJGO9iETOfCrkoT+/DpKSCo2f5cfANUZhKCPA/N +uXkaHJYO2Bmas1J1bRGH2shn2NuUN9Je/rCNgwxJHp3ae3KU7q4wXDGFLQfbQGY/g6Z MHCuX64YwNPeu6VJ0UDqnYXL0OGswyRJtD26drChO7OBGjn7bXLLsyDKG74sbkCkaTCU 60RON+4zwke73v6DvmCfQXlATVpyDNNFmtZ49yY3nushCHIHTfVFRgelxDWmhAaNBBW0 D5yojLqgIiIPxjEFHhRO3nRYqvaoJ8bm5DSL8UxNabytoeu4/ePCt71IjmIFrWgxWIUc iJtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@amyspark.me header.s=gm1 header.b=OfAnUePH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amyspark.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z9-20020a1709060be900b0099bd046b94bsi3511236ejg.1050.2023.08.05.13.47.39; Sat, 05 Aug 2023 13:47:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@amyspark.me header.s=gm1 header.b=OfAnUePH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amyspark.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75969689BB5; Sat, 5 Aug 2023 23:47:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1714E689BB5 for ; Sat, 5 Aug 2023 23:47:30 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B8539240003; Sat, 5 Aug 2023 20:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amyspark.me; s=gm1; t=1691268449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8J3BypcQnHdyc+8fMgTz3a3+7UeBJKp7gm54l+xo2YM=; b=OfAnUePHBmujV7LDIrOunEUhKP3SXHw7eSxtCTCuBDnFYsFtHrQ2pBOGUJcJB0SFlKo9wA 9Y6fsZzzWGUPa69muAttgYRP8i5m4b/4FpcEkXq8/Go2vuFyH8Mx+JwKFB567XDmvMQAW9 Yqghhhkd7zD+3r+Nqf6SI2XQGt7o3SwjkxhTIimiAFTwIn42xcX9R/fyruCXYYukGv/BHI wA2zy2doEnUTdhVPUPnOUojxxFyPKVgOsFNwT3hn4ECCdn/wFjDdIz6IuKAJvsGctXOhME dUsTAi+G4i5DdRdinBLqRIy4/mKfdO5AP6Sil3x+WtBA5I1HSVYFtDXLSktMfQ== Message-ID: <62ee336f-50f7-4986-b820-f50ec71492b6@amyspark.me> Date: Sat, 5 Aug 2023 17:47:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: "L. E. Segovia" To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US In-Reply-To: X-GND-Sasl: amy@amyspark.me Subject: [FFmpeg-devel] [PATCH v3 1/1] configure: Set WIN32_LEAN_AND_MEAN at configure time 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aWSMapVCNEAO Including winsock2.h or windows.h without WIN32_LEAN_AND_MEAN cause bzlib.h to parse as nonsense, due to an instance of #define char small in rpcndr.h. See: https://stackoverflow.com/a/27794577 Signed-off-by: L. E. Segovia --- compat/atomics/win32/stdatomic.h | 1 - compat/w32pthreads.h | 1 - configure | 1 + libavdevice/dshow_capture.h | 1 - libavdevice/opengl_enc.c | 1 - libavfilter/vsrc_ddagrab.c | 1 - libavformat/os_support.c | 6 ++---- libavutil/wchar_filename.h | 1 - libswscale/utils.c | 1 - 9 files changed, 3 insertions(+), 11 deletions(-) diff --git a/compat/atomics/win32/stdatomic.h b/compat/atomics/win32/stdatomic.h index 28a627bfd3..4f8ac2bb60 100644 --- a/compat/atomics/win32/stdatomic.h +++ b/compat/atomics/win32/stdatomic.h @@ -19,7 +19,6 @@ #ifndef COMPAT_ATOMICS_WIN32_STDATOMIC_H #define COMPAT_ATOMICS_WIN32_STDATOMIC_H -#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 6405e72b64..4ea0ce1ff4 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -35,7 +35,6 @@ * As most functions here are used without checking return values, * only implement return values as necessary. */ -#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/configure b/configure index 99388e7664..881a10bc0c 100755 --- a/configure +++ b/configure @@ -5716,6 +5716,7 @@ case $target_os in fi ! enabled small && test_cmd $windres --version && enable gnu_windres enabled x86_32 && check_ldflags -LARGEADDRESSAWARE + add_cppflags -DWIN32_LEAN_AND_MEAN shlibdir_default="$bindir_default" SLIBPREF="" SLIBSUF=".dll" diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index b548cd7afc..81e684b9be 100644 --- a/libavdevice/dshow_capture.h +++ b/libavdevice/dshow_capture.h @@ -27,7 +27,6 @@ #include "avdevice.h" #define COBJMACROS -#define WIN32_LEAN_AND_MEAN #include #define NO_DSHOW_STRSAFE #include diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index f9dc846bf1..1b0cf5aa8f 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -30,7 +30,6 @@ #include "config.h" #if HAVE_WINDOWS_H -#define WIN32_LEAN_AND_MEAN #include #endif #if HAVE_OPENGL_GL3_H diff --git a/libavfilter/vsrc_ddagrab.c b/libavfilter/vsrc_ddagrab.c index 525d48110a..9093b89c5b 100644 --- a/libavfilter/vsrc_ddagrab.c +++ b/libavfilter/vsrc_ddagrab.c @@ -22,7 +22,6 @@ #undef _WIN32_WINNT #define _WIN32_WINNT 0x0A00 #endif -#define WIN32_LEAN_AND_MEAN #include diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 15cea7fa5b..2de6a7c3d9 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -34,11 +34,9 @@ #if HAVE_SYS_TIME_H #include #endif /* HAVE_SYS_TIME_H */ -#if HAVE_WINSOCK2_H -#include -#elif HAVE_SYS_SELECT_H +#if HAVE_SYS_SELECT_H #include -#endif /* HAVE_WINSOCK2_H */ +#endif /* HAVE_SYS_SELECT_H */ #endif /* !HAVE_POLL_H */ #include "network.h" diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index fbc0a55146..4f87e6f88b 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -21,7 +21,6 @@ #ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN #include #include "mem.h" diff --git a/libswscale/utils.c b/libswscale/utils.c index 8fe34a3437..8e74c6603e 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -34,7 +34,6 @@ #endif #endif #if HAVE_VIRTUALALLOC -#define WIN32_LEAN_AND_MEAN #include #endif