From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A073CAC5B0 for ; Sun, 21 Sep 2025 09:03:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C030E10E36A; Sun, 21 Sep 2025 09:03:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=amazon.com header.i=@amazon.com header.b="FFVETJ+x"; dkim-atps=neutral Received: from fra-out-004.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-004.esa.eu-central-1.outbound.mail-perimeter.amazon.com [3.74.81.189]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1245D10E987; Fri, 19 Sep 2025 10:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1758277636; x=1789813636; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4SfYhUHUdz2vUYRpmznvvnCmHBX3qlcufUWUmq1eJX8=; b=FFVETJ+xi5/POyUyJJXvdMhFydyR2c7++P686mqBA7NiK6YFVnZbM6NK VwVr358XzqauCB56mnMgXDYWdCAthoBXdezM0xYw1rzRwdVVBnO/p+hoK J+5AL7nJ1M6SafN/J29Rbf34Z0verIyZI3ZQx5P1m35dMX/PvdcL/cPt7 M9prasf95pGf3JfzIe4hiUoPuiCgvYJFTUiIB+zo+esvP8ABvca+OBCjC 1dOOTYLFyBhbJ0WtEzxYW0JtaeTMSr2vUmX9e4HMqzmJJfxqgRvb885Ln dGgPSkfWEFFXET98gHRu17hgrquCgwy8zZX4J161z6RA5p5l1sYBT+EjZ w==; X-CSE-ConnectionGUID: PDJJvTtNSH+hjbi2ebjBfw== X-CSE-MsgGUID: DLaM/fsvSKOsCR4u1obQDg== X-IronPort-AV: E=Sophos;i="6.18,277,1751241600"; d="scan'208";a="2367702" Received: from ip-10-6-6-97.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.6.97]) by internal-fra-out-004.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 28962e4b-a5f6-44f1-9053-96eac3c7bb76; Fri, 19 Sep 2025 10:27:14 +0000 (UTC) X-Farcaster-Flow-ID: 28962e4b-a5f6-44f1-9053-96eac3c7bb76 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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.19.116.181] X-ClientProxiedBy: EX19D042UWA003.ant.amazon.com (10.13.139.44) To EX19D018EUA004.ant.amazon.com (10.252.50.85) X-Mailman-Approved-At: Sun, 21 Sep 2025 09:02:48 +0000 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" 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