patch 'eal/windows: remove useless C++ include guard' has been queued to stable release 20.11.5

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri Feb 18 13:38:50 CET 2022


Hi,

FYI, your patch has been queued to stable release 20.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/20/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/cafb0cbdb4dbddba84bcdd115e6be2cd8deabbe9

Thanks.

Luca Boccassi

---
>From cafb0cbdb4dbddba84bcdd115e6be2cd8deabbe9 Mon Sep 17 00:00:00 2001
From: Weiguo Li <liwg06 at foxmail.com>
Date: Mon, 7 Feb 2022 20:37:00 +0800
Subject: [PATCH] eal/windows: remove useless C++ include guard

[ upstream commit 0ae7844fcdad143ce4833f4fc8d886740b3f482d ]

Remove the incomplete cplusplus guard in internal header.

Fixes: 6e1ed4cbbe99 ("eal/windows: add dirent implementation")

Signed-off-by: Weiguo Li <liwg06 at foxmail.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Acked-by: Pallavi Kadam <pallavi.kadam at intel.com>
---
 lib/librte_eal/windows/include/dirent.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/librte_eal/windows/include/dirent.h b/lib/librte_eal/windows/include/dirent.h
index 34eb077f8c..b522424403 100644
--- a/lib/librte_eal/windows/include/dirent.h
+++ b/lib/librte_eal/windows/include/dirent.h
@@ -658,7 +658,4 @@ dirent_set_errno(int error)
 #endif
 }
 
-#ifdef __cplusplus
-}
-#endif
 #endif /*DIRENT_H*/
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-18 12:37:41.015786371 +0000
+++ 0081-eal-windows-remove-useless-C-include-guard.patch	2022-02-18 12:37:37.758793438 +0000
@@ -1 +1 @@
-From 0ae7844fcdad143ce4833f4fc8d886740b3f482d Mon Sep 17 00:00:00 2001
+From cafb0cbdb4dbddba84bcdd115e6be2cd8deabbe9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0ae7844fcdad143ce4833f4fc8d886740b3f482d ]
+
@@ -14 +16 @@
- lib/eal/windows/include/dirent.h | 3 ---
+ lib/librte_eal/windows/include/dirent.h | 3 ---
@@ -17 +19 @@
-diff --git a/lib/eal/windows/include/dirent.h b/lib/eal/windows/include/dirent.h
+diff --git a/lib/librte_eal/windows/include/dirent.h b/lib/librte_eal/windows/include/dirent.h
@@ -19,2 +21,2 @@
---- a/lib/eal/windows/include/dirent.h
-+++ b/lib/eal/windows/include/dirent.h
+--- a/lib/librte_eal/windows/include/dirent.h
++++ b/lib/librte_eal/windows/include/dirent.h


More information about the stable mailing list