From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <dev-bounces@dpdk.org> Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 61CFCA0C41; Wed, 15 Sep 2021 23:41:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DEBAF4003F; Wed, 15 Sep 2021 23:41:01 +0200 (CEST) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mails.dpdk.org (Postfix) with ESMTP id 0ACD74003C for <dev@dpdk.org>; Wed, 15 Sep 2021 23:41:00 +0200 (CEST) Received: by mail-lf1-f46.google.com with SMTP id t10so4318622lfd.8 for <dev@dpdk.org>; Wed, 15 Sep 2021 14:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fTi0sy9kNVCFHI0Ca62+JZ6G1lsAalvhlyP2+N0LIXU=; b=RuwGgHoPvZgOf9iAOMHatgHLqJRhAxh4S1tmaL6gYlQo2QcW7uXOC29jeCUfQkLcNE d5/Iw4wk34UtyUXXSfu+IAbLI33ZX6RiZ/cWYn1P9+16iPEywhz6Inc7Cb3AUxqPyrCK 1F/sUL2sLhYDAO1kj3OBu+Yw1pBRPz7l8SrhbPMPFcZkf7noPRDcSkYpIDWlJIRlo7Tw Mgtg1yBH42cnCti02ivJ+jqUU1ryGLUeOeHVAM29A36hyHNG2MZzQCHZcMyma39K1+VT +yoRa8X7bb8Lw+1B5ak8FXYrd21sWZG1ySF6TY3JxjZELfYoeH+pfR6w+LVeebtnw5vm XlVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fTi0sy9kNVCFHI0Ca62+JZ6G1lsAalvhlyP2+N0LIXU=; b=x0geZRtSdnoV8CaGZP0g3VCBNit+iWjFohLiB3TuxuyVOe9nNBM+QV4czeITyaOrCU YDCofv3uZ7u758jR7MxSsXjmtsSDHIcIkg94MQyPx2XiNPPWjNJ2+y2lMYuMN9kdq8iy XtLkcNuX5pzIAGwIs2EvUG6EtHyraK0qRBDdwArz9RHBjMwuHW4TCoqpn6sSsrPMHlRK S92iEct/SOvOXoNN2LINpJNAhx6Pbj+Ma0NP1AwfvBwCWg07Q5E5lOZDCQicziHXb3W0 JHOJP0xGX3AkcHwGVRyo026DYJpE3XjR+p/VIoyhJy7ZTiGjYP8Zmo/61OQ+n/92FqRR oQhQ== X-Gm-Message-State: AOAM531FT3eoZham+YXmGcBoog2DFczADQLc7T8NkbHL4qYuQ/pn/xOo 4NwdzCM6xfmM4MGIGV5qYaB1J01YO1Rb3A== X-Google-Smtp-Source: ABdhPJzW5lRgC8wciluIn56gMDz7776j8FZy2Cdyk5OkcFbBBUhN5Dd/urLO13gqDog6SdXrbH52tw== X-Received: by 2002:a2e:1508:: with SMTP id s8mr1910375ljd.47.1631742058975; Wed, 15 Sep 2021 14:40:58 -0700 (PDT) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id o4sm85989lfi.16.2021.09.15.14.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 14:40:58 -0700 (PDT) From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com> To: dev@dpdk.org Cc: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>, Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>, Pallavi Kadam <pallavi.kadam@intel.com>, Tyler Retzlaff <roretzla@linux.microsoft.com> Date: Thu, 16 Sep 2021 00:40:47 +0300 Message-Id: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 0/5] lib: Windows compatibility renaming X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> Windows SDK headers define `s_addr`, `min`, and `max` macros. When Windows SDK and DPDK headers are used in the same file, these macros break definitions of some DPDK structures and inline functions. Rename the problematic fields and local variables per the deprecation notice: https://mails.dpdk.org/archives/dev/2021-July/215270.html Also remove a workaround in lib/net. Some checkpatch warnings about long lines are left: - when they existed before; - when it's one extra symbol and the fix is not helpful; - in performance-thread app. Dmitry Kozlyuk (5): compressdev: rename fields for Windows compatibility cryptodev: rename fields for Windows compatibility table: rename local variable for Windows compatibility ring: rename local variables for Windows compatibility net: rename Ethernet header fields .../comp_perf_test_common.c | 6 +- app/test-compress-perf/main.c | 2 +- app/test-pmd/5tswap.c | 6 +- app/test-pmd/csumonly.c | 4 +- app/test-pmd/flowgen.c | 4 +- app/test-pmd/icmpecho.c | 16 +- app/test-pmd/ieee1588fwd.c | 6 +- app/test-pmd/macfwd.c | 4 +- app/test-pmd/macswap.h | 4 +- app/test-pmd/txonly.c | 4 +- app/test-pmd/util.c | 4 +- app/test/packet_burst_generator.c | 4 +- app/test/test_bpf.c | 4 +- app/test/test_cryptodev_asym.c | 4 +- app/test/test_link_bonding_mode4.c | 15 +- doc/guides/rel_notes/deprecation.rst | 9 - doc/guides/rel_notes/release_20_11.rst | 9 + drivers/compress/isal/isal_compress_pmd_ops.c | 4 +- drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 4 +- drivers/compress/qat/qat_comp_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd_ops.c | 4 +- drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c | 28 +- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 284 +++++----- drivers/crypto/armv8/rte_armv8_pmd_ops.c | 24 +- drivers/crypto/bcmfs/bcmfs_sym_capabilities.c | 288 +++++----- drivers/crypto/caam_jr/caam_jr_capabilities.c | 88 +-- drivers/crypto/ccp/ccp_pmd_ops.c | 208 ++++---- .../crypto/cnxk/cnxk_cryptodev_capabilities.c | 300 +++++------ drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h | 280 +++++----- drivers/crypto/dpaa_sec/dpaa_sec.h | 208 ++++---- drivers/crypto/kasumi/rte_kasumi_pmd_ops.c | 16 +- drivers/crypto/mlx5/mlx5_crypto.c | 8 +- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 192 +++---- .../crypto/nitrox/nitrox_sym_capabilities.c | 56 +- drivers/crypto/null/null_crypto_pmd_ops.c | 12 +- .../octeontx/otx_cryptodev_capabilities.c | 252 ++++----- .../octeontx2/otx2_cryptodev_capabilities.c | 284 +++++----- drivers/crypto/openssl/rte_openssl_pmd_ops.c | 208 ++++---- drivers/crypto/qat/qat_asym_capabilities.h | 12 +- drivers/crypto/qat/qat_sym_capabilities.h | 504 +++++++++--------- .../scheduler/rte_cryptodev_scheduler.c | 20 +- drivers/crypto/snow3g/rte_snow3g_pmd_ops.c | 20 +- .../virtio/virtio_crypto_capabilities.h | 16 +- drivers/crypto/zuc/rte_zuc_pmd_ops.c | 20 +- drivers/net/avp/avp_ethdev.c | 6 +- drivers/net/bnx2x/bnx2x.c | 16 +- drivers/net/bonding/rte_eth_bond_8023ad.c | 6 +- drivers/net/bonding/rte_eth_bond_alb.c | 4 +- drivers/net/bonding/rte_eth_bond_pmd.c | 22 +- drivers/net/enic/enic_flow.c | 8 +- drivers/net/ixgbe/ixgbe_ipsec.c | 28 +- drivers/net/mlx5/mlx5_txpp.c | 4 +- drivers/net/octeontx2/otx2_ethdev_sec.c | 32 +- drivers/net/txgbe/txgbe_ipsec.c | 28 +- examples/bond/main.c | 14 +- examples/ethtool/ethtool-app/main.c | 4 +- examples/eventdev_pipeline/pipeline_common.h | 4 +- examples/flow_filtering/main.c | 4 +- examples/ioat/ioatfwd.c | 4 +- examples/ip_fragmentation/main.c | 4 +- examples/ip_reassembly/main.c | 4 +- examples/ipsec-secgw/ipsec-secgw.c | 4 +- examples/ipsec-secgw/ipsec_worker.c | 4 +- examples/ipv4_multicast/main.c | 4 +- examples/l2fwd-crypto/main.c | 70 +-- examples/l2fwd-event/l2fwd_common.h | 4 +- examples/l2fwd-jobstats/main.c | 4 +- examples/l2fwd-keepalive/main.c | 4 +- examples/l2fwd/main.c | 4 +- examples/l3fwd-acl/main.c | 19 +- examples/l3fwd-power/main.c | 6 +- examples/l3fwd/l3fwd_em.h | 4 +- examples/l3fwd/l3fwd_fib.c | 2 +- examples/l3fwd/l3fwd_lpm.c | 2 +- examples/l3fwd/l3fwd_lpm.h | 4 +- examples/link_status_interrupt/main.c | 4 +- .../performance-thread/l3fwd-thread/main.c | 40 +- examples/ptpclient/ptpclient.c | 16 +- examples/vhost/main.c | 10 +- examples/vmdq/main.c | 4 +- examples/vmdq_dcb/main.c | 4 +- lib/compressdev/rte_compressdev.h | 4 +- lib/cryptodev/rte_cryptodev.c | 14 +- lib/cryptodev/rte_cryptodev.h | 4 +- lib/ethdev/rte_flow.h | 4 +- lib/gro/gro_tcp4.c | 4 +- lib/gro/gro_udp4.c | 4 +- lib/gro/gro_vxlan_tcp4.c | 8 +- lib/gro/gro_vxlan_udp4.c | 8 +- lib/net/rte_arp.c | 4 +- lib/net/rte_ether.h | 22 +- lib/pipeline/rte_table_action.c | 40 +- lib/ring/rte_ring_c11_pvt.h | 8 +- lib/ring/rte_ring_generic_pvt.h | 8 +- lib/ring/rte_ring_rts_elem_pvt.h | 6 +- lib/table/rte_lru_x86.h | 4 +- 97 files changed, 1992 insertions(+), 2004 deletions(-) -- 2.29.3