From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com [52.28.197.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AE933081C4; Fri, 19 Sep 2025 10:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.28.197.132 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758277638; cv=none; b=rvKa8Nr8Sq7h6qeE64H2zAnHQztdCKpitLL0NZYsfAUTkxJsdxe4dH5N9lzygssmtUK057kjRJPfTJnVDlqUgjduAjQ4G5bJa0trFyFigkKfwYEHYy81OY63C36TVOspjiMlmMsoO6/7GlS6bGUSuHqG0+PDcktcc4+qehweooY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758277638; c=relaxed/simple; bh=Bru4b29AnwamOZouaMpTQyhV9rVjknKiTLKplaOVaxA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FfL6KCScQYv4x02R4uo2rvxnzG2ZS9AEjjj+hxBzDI0g3Jo+MZivUVpC/xiaKHue4kZJ+1N9d1aQoVXU/Kl/H/RjzFQC59fX8mR/sqxdWRlj0dX/zdwDq90EmeBdCqyFBdKy6SNxmNwfUsKCKKv00szPAWXgWFBbDF5WhxvE1g4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.com; dkim=pass (2048-bit key) header.d=amazon.com header.i=@amazon.com header.b=pNAb3CG7; arc=none smtp.client-ip=52.28.197.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.com header.i=@amazon.com header.b="pNAb3CG7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1758277637; x=1789813637; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4SfYhUHUdz2vUYRpmznvvnCmHBX3qlcufUWUmq1eJX8=; b=pNAb3CG7wjgJXOurk9ygCiGZnzgoJAfjzIHtVTHwPore5bK0Z9alaExj N+2zWXzHZy0cwIFk9/mpq/FQGkIS8Y6uE/1KRJtc/g/XN506mYVsOBf0M xbC5OugRbxKalMQhT4l2ln/aqd70cwNAZrfktoBMdlzphuJzZhmDboNKk zPr/839sK1TaiZ1EWevlBADlVjqF5kG5OGJWuR+XkCi3YdxYktA5u4VTs DXCJplYRf80b36+HncX2OrhCV1f2te10o31P+8k82H0RNDN1Wg1fkcaPQ b+kPPsz9xPjSMZa/uAHJRY2k9mk3n+mhiZAi0QfbCjuBTO0frD7BHOtuX Q==; X-CSE-ConnectionGUID: z1cDqonPRyuUzbCuVhBWng== X-CSE-MsgGUID: aV4dNxWqQgOj00cn9kOCjA== X-IronPort-AV: E=Sophos;i="6.18,277,1751241600"; d="scan'208";a="2263980" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Sep 2025 10:27:14 +0000 Received: from EX19MTAEUA001.ant.amazon.com [54.240.197.233:2492] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.39.25:2525] with esmtp (Farcaster) id e89569ac-5733-47ab-abd5-44525f19a0db; Fri, 19 Sep 2025 10:27:14 +0000 (UTC) X-Farcaster-Flow-ID: e89569ac-5733-47ab-abd5-44525f19a0db Received: from EX19D018EUA004.ant.amazon.com (10.252.50.85) by EX19MTAEUA001.ant.amazon.com (10.252.50.192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Fri, 19 Sep 2025 10:27:13 +0000 Received: from dev-dsk-farbere-1a-46ecabed.eu-west-1.amazon.com (172.19.116.181) by EX19D018EUA004.ant.amazon.com (10.252.50.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Fri, 19 Sep 2025 10:26:46 +0000 From: Eliav Farber To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: Subject: [PATCH 16/27 5.10.y] lib: zstd: drop local MIN/MAX macros in favor of generic ones Date: Fri, 19 Sep 2025 10:17:16 +0000 Message-ID: <20250919101727.16152-17-farbere@amazon.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250919101727.16152-1-farbere@amazon.com> References: <20250919101727.16152-1-farbere@amazon.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: EX19D042UWA003.ant.amazon.com (10.13.139.44) To EX19D018EUA004.ant.amazon.com (10.252.50.85) Remove the MIN() and MAX() macros from zstd_internal.h to avoid duplicate definitions now that the generic MIN() and MAX() macros are available globally. This change continues commit 1a251f52cfdc ("minmax: make generic MIN() and MAX() macros available everywhere") and is required for 5.10.y, where these macros did not exist in zstd_internal.h when the upstream change was made. Signed-off-by: Eliav Farber --- lib/zstd/zstd_internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/zstd/zstd_internal.h b/lib/zstd/zstd_internal.h index dac753397f86..927ed4e8c11c 100644 --- a/lib/zstd/zstd_internal.h +++ b/lib/zstd/zstd_internal.h @@ -36,8 +36,6 @@ /*-************************************* * shared macros ***************************************/ -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define CHECK_F(f) \ { \ size_t const errcod = f; \ -- 2.47.3