From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 535CD45E36; Thu, 5 Dec 2024 05:21:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93880427A6; Thu, 5 Dec 2024 05:20:47 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 76EEE4275D for ; Thu, 5 Dec 2024 05:20:37 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id E42E820ACD68; Wed, 4 Dec 2024 20:20:35 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com E42E820ACD68 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733372435; bh=AbZpgVDbJraSbMGorMBAik84bEKC5Fb77OF7sFt1tbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DQY6oQpupjBJTazgv0FSs8FvGzXyoMw/nbO2rXdmvCMopq+1nf69dAe4QFDTBpGIV I4QEfSZi7hWliaqsthivbpTH+azmnjGIAW0n45YH1hRG4uPO6Hz8ksbu9jNH687eqO dDJXfSto81l2G1uAO8pIPfaQ457ysyl1pRxB7jQg= From: Andre Muezerie To: dev@dpdk.org Cc: Andre Muezerie Subject: [PATCH v3 6/7] drivers/raw: eliminate dependency on non-portable __SIZEOF_LONG__ Date: Wed, 4 Dec 2024 20:20:28 -0800 Message-Id: <1733372429-3996-7-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1733372429-3996-1-git-send-email-andremue@linux.microsoft.com> References: <1733342995-3722-2-git-send-email-andremue@linux.microsoft.com> <1733372429-3996-1-git-send-email-andremue@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Macro __SIZEOF_LONG__ is not standardized and MSVC does not define it. Therefore the errors below are seen with MSVC: ../lib/mldev/mldev_utils_scalar.c(465): error C2065: '__SIZEOF_LONG__': undeclared identifier ../lib/mldev/mldev_utils_scalar.c(478): error C2051: case expression not constant ../lib/mldev/mldev_utils_scalar_bfloat16.c(33): error C2065: '__SIZEOF_LONG__': undeclared identifier ../lib/mldev/mldev_utils_scalar_bfloat16.c(49): error C2051: case expression not constant Turns out that the places where __SIZEOF_LONG__ is currently being used can equally well use sizeof(long) instead. Signed-off-by: Andre Muezerie --- drivers/raw/ifpga/base/opae_osdep.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/raw/ifpga/base/opae_osdep.h b/drivers/raw/ifpga/base/opae_osdep.h index cb780b1fed..e4767e2d7a 100644 --- a/drivers/raw/ifpga/base/opae_osdep.h +++ b/drivers/raw/ifpga/base/opae_osdep.h @@ -9,6 +9,8 @@ #include #include +#include + #ifdef RTE_LIB_EAL #include "osdep_rte/osdep_generic.h" #else @@ -30,12 +32,6 @@ struct uuid { }; #ifndef LINUX_MACROS -#ifndef BITS_PER_LONG -#define BITS_PER_LONG (__SIZEOF_LONG__ * 8) -#endif -#ifndef BITS_PER_LONG_LONG -#define BITS_PER_LONG_LONG (__SIZEOF_LONG_LONG__ * 8) -#endif #ifndef BIT #define BIT(a) (1UL << (a)) #endif /* BIT */ @@ -43,11 +39,11 @@ struct uuid { #define BIT_ULL(a) (1ULL << (a)) #endif /* BIT_ULL */ #ifndef GENMASK -#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) +#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (RTE_BITS_PER_LONG - 1 - (h)))) #endif /* GENMASK */ #ifndef GENMASK_ULL #define GENMASK_ULL(h, l) \ - (((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h)))) + (((~0ULL) << (l)) & (~0ULL >> (RTE_BITS_PER_LONG_LONG - 1 - (h)))) #endif /* GENMASK_ULL */ #endif /* LINUX_MACROS */ -- 2.47.0.vfs.0.3