[dpdk-stable] patch 'eal/windows: fix C++ compatibility' has been queued to stable release 20.11.1

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri Feb 5 12:16:46 CET 2021


Hi,

FYI, your patch has been queued to stable release 20.11.1

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/07/21. 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/aba3a242ef9551e1ca87112ce89834308064015a

Thanks.

Luca Boccassi

---
>From aba3a242ef9551e1ca87112ce89834308064015a Mon Sep 17 00:00:00 2001
From: Tyler Retzlaff <roretzla at linux.microsoft.com>
Date: Fri, 15 Jan 2021 11:38:21 -0800
Subject: [PATCH] eal/windows: fix C++ compatibility

[ upstream commit 56446c913f0a0c28fb1d734986942da122b1174a ]

Explicitly cast void * to type * so that EAL headers may be compiled
as C or C++.

Fixes: e8428a9d89f1 ("eal/windows: add some basic functions and macros")

Signed-off-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
 lib/librte_eal/windows/include/rte_os.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/librte_eal/windows/include/rte_os.h
index ea3fe60e53..7ef38ff06c 100644
--- a/lib/librte_eal/windows/include/rte_os.h
+++ b/lib/librte_eal/windows/include/rte_os.h
@@ -86,7 +86,7 @@ asprintf(char **buffer, const char *format, ...)
 		return -1;
 	size++;
 
-	*buffer = malloc(size);
+	*buffer = (char *)malloc(size);
 	if (*buffer == NULL)
 		return -1;
 
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:34.589618816 +0000
+++ 0120-eal-windows-fix-C-compatibility.patch	2021-02-05 11:18:28.994694692 +0000
@@ -1 +1 @@
-From 56446c913f0a0c28fb1d734986942da122b1174a Mon Sep 17 00:00:00 2001
+From aba3a242ef9551e1ca87112ce89834308064015a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 56446c913f0a0c28fb1d734986942da122b1174a ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list