patch 'eal/windows: add missing C++ include guards' has been queued to stable release 20.11.6

Xueming Li xuemingl at nvidia.com
Tue Jun 21 10:01:10 CEST 2022


Hi,

FYI, your patch has been queued to stable release 20.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/23/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/9526e5c4a55acd42dc83221b6d6dc14fcf683041

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 9526e5c4a55acd42dc83221b6d6dc14fcf683041 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 5 Apr 2022 15:48:58 +0200
Subject: [PATCH] eal/windows: add missing C++ include guards
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 1e230b9be8866939ef7ce9f7f16b8c8369b7bc28 ]

Add missing 'extern "C"' to file.

Fixes: 1db72630da0c ("eal/windows: do not expose private facilities")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
 lib/librte_eal/windows/include/rte_windows.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h
index b82af34f6d..422c989966 100644
--- a/lib/librte_eal/windows/include/rte_windows.h
+++ b/lib/librte_eal/windows/include/rte_windows.h
@@ -5,6 +5,10 @@
 #ifndef _RTE_WINDOWS_H_
 #define _RTE_WINDOWS_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file Windows-specific facilities
  *
@@ -42,4 +46,8 @@
 		RTE_FMT_HEAD(__VA_ARGS__,) "\n", GetLastError(), \
 		RTE_FMT_TAIL(__VA_ARGS__,)))
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_WINDOWS_H_ */
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-21 15:37:49.489980831 +0800
+++ 0004-eal-windows-add-missing-C-include-guards.patch	2022-06-21 15:37:48.954450956 +0800
@@ -1 +1 @@
-From 1e230b9be8866939ef7ce9f7f16b8c8369b7bc28 Mon Sep 17 00:00:00 2001
+From 9526e5c4a55acd42dc83221b6d6dc14fcf683041 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 1e230b9be8866939ef7ce9f7f16b8c8369b7bc28 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -14 +16 @@
- lib/eal/windows/include/rte_windows.h | 8 ++++++++
+ lib/librte_eal/windows/include/rte_windows.h | 8 ++++++++
@@ -17,4 +19,4 @@
-diff --git a/lib/eal/windows/include/rte_windows.h b/lib/eal/windows/include/rte_windows.h
-index 0063b5d78c..83730c3d2e 100644
---- a/lib/eal/windows/include/rte_windows.h
-+++ b/lib/eal/windows/include/rte_windows.h
+diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h
+index b82af34f6d..422c989966 100644
+--- a/lib/librte_eal/windows/include/rte_windows.h
++++ b/lib/librte_eal/windows/include/rte_windows.h
@@ -32 +34 @@
-@@ -48,4 +52,8 @@
+@@ -42,4 +46,8 @@


More information about the stable mailing list