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 CB576A00BE for ; Tue, 15 Mar 2022 10:46:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BC91640395; Tue, 15 Mar 2022 10:46:46 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 4A12D4014F for ; Tue, 15 Mar 2022 10:46:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647337605; x=1678873605; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sXXgA/nK6WkTYU3ow7RYdFZKZGGNIMuA6t4+T08sTxk=; b=bhMNyiLgcLbUYgRG3yzW5vAnHwK1zAkOhHFFhjBwNQePHngMx3TRYvlb iAoij7cJFoWPYB/w60ONfAUGtko/yfz9YgTUlycwavSv1hFdgoLu/RHS4 pSkRLSTH8Kw5iUuRklQr6KeQAmRlGK3qhnpxxKyKnW8GgF96YQP4K9iFj DoipTqitRfgew15w1azRR9ygwgO03rQ2LDtO+WEKTjtFeEzPEzXZZ+I14 Gt0EmHQcbuKs4oV2q0dCFOHtrz/ywJ19xl5MBdjJywI9TeLnipN5vEudA bNR2z2otroDD3TE/ZXbXx1CWyJWMkhA+8tX4Ht5HQsrFfmU4igikB/PeI A==; X-IronPort-AV: E=McAfee;i="6200,9189,10286"; a="255088542" X-IronPort-AV: E=Sophos;i="5.90,182,1643702400"; d="scan'208";a="255088542" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2022 02:46:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,182,1643702400"; d="scan'208";a="497955647" Received: from silpixa00400883.ir.intel.com ([10.243.23.39]) by orsmga003.jf.intel.com with ESMTP; 15 Mar 2022 02:46:18 -0700 From: Brian Dooley To: stable@dpdk.org Cc: christian.ehrhardt@canonical.com, Brian Dooley , nhorman@tuxdriver.com, thomas@monjalon.net, anatoly.burakov@intel.com, adrien.mazarguil@6wind.com, anand.rawat@intel.com, Bruce Richardson , Tyler Retzlaff , Sergio Gonzalez Monroy , Jerin Jacob , Remy Horton , Harini Ramakrishnan , Pallavi Kadam Subject: [PATCH 19.11 1/3] eal: fix missing C++ guards Date: Tue, 15 Mar 2022 09:46:06 +0000 Message-Id: <20220315094608.1199076-2-brian.dooley@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220315094608.1199076-1-brian.dooley@intel.com> References: <20220315094608.1199076-1-brian.dooley@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [ upstream commit d7e9c02ccad8928b6b804049ced9a3ce6172d81e ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: af75078fece3 ("first public release") Fixes: 166a743c53fa ("compat: add infrastructure to support symbol versioning") Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name") Fixes: 75583b0d1efd ("eal: add keep alive monitoring") Fixes: 88701645c98c ("eal: move interrupt type out of igb_uio") Fixes: f04519d8092e ("lib: add missing include dependencies") Fixes: 428eb983f5f7 ("eal: add OS specific header file") Cc: nhorman@tuxdriver.com Cc: thomas@monjalon.net Cc: anatoly.burakov@intel.com Cc: adrien.mazarguil@6wind.com Cc: anand.rawat@intel.com Cc: stable@dpdk.org Signed-off-by: Brian Dooley Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/librte_eal/common/include/rte_branch_prediction.h | 8 ++++++++ lib/librte_eal/common/include/rte_compat.h | 8 ++++++++ lib/librte_eal/common/include/rte_hypervisor.h | 8 ++++++++ lib/librte_eal/common/include/rte_keepalive.h | 8 ++++++++ lib/librte_eal/common/include/rte_pci_dev_feature_defs.h | 8 ++++++++ lib/librte_eal/common/include/rte_pci_dev_features.h | 8 ++++++++ lib/librte_eal/common/include/rte_time.h | 8 ++++++++ lib/librte_eal/linux/eal/include/rte_os.h | 8 ++++++++ 8 files changed, 64 insertions(+) diff --git a/lib/librte_eal/common/include/rte_branch_prediction.h b/lib/librte_eal/common/include/rte_branch_prediction.h index 854ef9e5d..0256a9de6 100644 --- a/lib/librte_eal/common/include/rte_branch_prediction.h +++ b/lib/librte_eal/common/include/rte_branch_prediction.h @@ -10,6 +10,10 @@ #ifndef _RTE_BRANCH_PREDICTION_H_ #define _RTE_BRANCH_PREDICTION_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * Check if a branch is likely to be taken. * @@ -38,4 +42,8 @@ #define unlikely(x) __builtin_expect(!!(x), 0) #endif /* unlikely */ +#ifdef __cplusplus +} +#endif + #endif /* _RTE_BRANCH_PREDICTION_H_ */ diff --git a/lib/librte_eal/common/include/rte_compat.h b/lib/librte_eal/common/include/rte_compat.h index 3eb33784b..0b8ba4353 100644 --- a/lib/librte_eal/common/include/rte_compat.h +++ b/lib/librte_eal/common/include/rte_compat.h @@ -6,6 +6,10 @@ #ifndef _RTE_COMPAT_H_ #define _RTE_COMPAT_H_ +#ifdef __cplusplus +extern "C" { +#endif + #ifndef ALLOW_EXPERIMENTAL_API #define __rte_experimental \ @@ -19,4 +23,8 @@ __attribute__((section(".text.experimental"))) #endif +#ifdef __cplusplus +} +#endif + #endif /* _RTE_COMPAT_H_ */ diff --git a/lib/librte_eal/common/include/rte_hypervisor.h b/lib/librte_eal/common/include/rte_hypervisor.h index 5fe719c1d..1666431ce 100644 --- a/lib/librte_eal/common/include/rte_hypervisor.h +++ b/lib/librte_eal/common/include/rte_hypervisor.h @@ -5,6 +5,10 @@ #ifndef RTE_HYPERVISOR_H #define RTE_HYPERVISOR_H +#ifdef __cplusplus +extern "C" { +#endif + /** * @file * Hypervisor awareness. @@ -30,4 +34,8 @@ rte_hypervisor_get(void); const char * rte_hypervisor_get_name(enum rte_hypervisor id); +#ifdef __cplusplus +} +#endif + #endif /* RTE_HYPERVISOR_H */ diff --git a/lib/librte_eal/common/include/rte_keepalive.h b/lib/librte_eal/common/include/rte_keepalive.h index 4bda7ca56..cd5099295 100644 --- a/lib/librte_eal/common/include/rte_keepalive.h +++ b/lib/librte_eal/common/include/rte_keepalive.h @@ -11,6 +11,10 @@ #ifndef _KEEPALIVE_H_ #define _KEEPALIVE_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -139,4 +143,8 @@ rte_keepalive_register_relay_callback(struct rte_keepalive *keepcfg, rte_keepalive_relay_callback_t callback, void *data); +#ifdef __cplusplus +} +#endif + #endif /* _KEEPALIVE_H_ */ diff --git a/lib/librte_eal/common/include/rte_pci_dev_feature_defs.h b/lib/librte_eal/common/include/rte_pci_dev_feature_defs.h index e12c22081..c5bb63128 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_feature_defs.h +++ b/lib/librte_eal/common/include/rte_pci_dev_feature_defs.h @@ -5,6 +5,10 @@ #ifndef _RTE_PCI_DEV_DEFS_H_ #define _RTE_PCI_DEV_DEFS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* interrupt mode */ enum rte_intr_mode { RTE_INTR_MODE_NONE = 0, @@ -13,4 +17,8 @@ enum rte_intr_mode { RTE_INTR_MODE_MSIX }; +#ifdef __cplusplus +} +#endif + #endif /* _RTE_PCI_DEV_DEFS_H_ */ diff --git a/lib/librte_eal/common/include/rte_pci_dev_features.h b/lib/librte_eal/common/include/rte_pci_dev_features.h index 6104123d2..ee6e10590 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_features.h +++ b/lib/librte_eal/common/include/rte_pci_dev_features.h @@ -5,6 +5,10 @@ #ifndef _RTE_PCI_DEV_FEATURES_H #define _RTE_PCI_DEV_FEATURES_H +#ifdef __cplusplus +extern "C" { +#endif + #include #define RTE_INTR_MODE_NONE_NAME "none" @@ -12,4 +16,8 @@ #define RTE_INTR_MODE_MSI_NAME "msi" #define RTE_INTR_MODE_MSIX_NAME "msix" +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/librte_eal/common/include/rte_time.h b/lib/librte_eal/common/include/rte_time.h index 5ad7c8841..ec25f7b93 100644 --- a/lib/librte_eal/common/include/rte_time.h +++ b/lib/librte_eal/common/include/rte_time.h @@ -5,6 +5,10 @@ #ifndef _RTE_TIME_H_ #define _RTE_TIME_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -98,4 +102,8 @@ rte_ns_to_timespec(uint64_t nsec) return ts; } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_TIME_H_ */ diff --git a/lib/librte_eal/linux/eal/include/rte_os.h b/lib/librte_eal/linux/eal/include/rte_os.h index 390b87b3a..afa28ece9 100644 --- a/lib/librte_eal/linux/eal/include/rte_os.h +++ b/lib/librte_eal/linux/eal/include/rte_os.h @@ -5,6 +5,10 @@ #ifndef _RTE_OS_H_ #define _RTE_OS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * This header should contain any definition * which is not supported natively or named differently in Linux. @@ -29,4 +33,8 @@ typedef cpu_set_t rte_cpuset_t; CPU_XOR(dst, &tmp, src); \ } while (0) +#ifdef __cplusplus +} +#endif + #endif /* _RTE_OS_H_ */ -- 2.25.1