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 <andre...@linux.microsoft.com>
---
 drivers/dma/dpaa/dpaa_qdma.h        | 3 +--
 drivers/dma/hisilicon/hisi_dmadev.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/dma/dpaa/dpaa_qdma.h b/drivers/dma/dpaa/dpaa_qdma.h
index 91eaf1455a..617e15fbc4 100644
--- a/drivers/dma/dpaa/dpaa_qdma.h
+++ b/drivers/dma/dpaa/dpaa_qdma.h
@@ -14,9 +14,8 @@
 #define RETRIES        5
 
 #ifndef GENMASK
-#define BITS_PER_LONG  (__SIZEOF_LONG__ * 8)
 #define GENMASK(h, l) \
-               (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h))))
+               (((~0UL) << (l)) & (~0UL >> (RTE_BITS_PER_LONG - 1 - (h))))
 #endif
 
 #define QDMA_CTRL_REGION_OFFSET 0
diff --git a/drivers/dma/hisilicon/hisi_dmadev.h 
b/drivers/dma/hisilicon/hisi_dmadev.h
index 786fe3cc0e..d1b4ae7da8 100644
--- a/drivers/dma/hisilicon/hisi_dmadev.h
+++ b/drivers/dma/hisilicon/hisi_dmadev.h
@@ -12,9 +12,8 @@
 #include <rte_dmadev_pmd.h>
 
 #define BIT(x) (1ul << (x))
-#define BITS_PER_LONG  (__SIZEOF_LONG__ * 8)
 #define GENMASK(h, l) \
-               (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h))))
+               (((~0UL) << (l)) & (~0UL >> (RTE_BITS_PER_LONG - 1 - (h))))
 #define BF_SHF(x) rte_bsf64(x)
 #define FIELD_GET(mask, reg) \
                ((typeof(mask))(((reg) & (mask)) >> BF_SHF(mask)))
-- 
2.47.0.vfs.0.3

Reply via email to