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 8F6CDA0524 for ; Fri, 5 Feb 2021 12:31:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 872CD1889A0; Fri, 5 Feb 2021 12:31:26 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mails.dpdk.org (Postfix) with ESMTP id 6E876188946 for ; Fri, 5 Feb 2021 12:31:24 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id u14so7332368wri.3 for ; Fri, 05 Feb 2021 03:31:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wgnZGnWy0YAVYMLxJqPE6qe0UQjp3e1ZaWUMbRUPX8o=; b=rqf/3/pM+B1f/rQoXxS/sXLWa9bWDOzVy3V4+FOj+mR0x3co7B6HQWwGWOlKQDjtDp 4J9m3KIB4MnN4qPVQ5fwJ/Ja4M/Sg7lpiTGz6JfmFncQ8WFH4m2VNHSXXv2dhrvivADK sQZ8naesctf9kgfbUi2pd+LWvA0TaRLC21T6wmVTBm9yVKUQWOA1D3zhspmz0dAJ+PNp sk/2acWp78PTkxfC+xWwx5xDctVVJXGPiB2++xFsFp99LrSchLVrAyB+MRCpk6ufNRGz FLKazvGRy0varPB+lLc5ZHMRyFNgKQZ3GS7w2Jt0p1C9L8IssmmtWHrKJvkgeBsCM88Y dTYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wgnZGnWy0YAVYMLxJqPE6qe0UQjp3e1ZaWUMbRUPX8o=; b=JHSRu0fR4gjkcM5ny/0l2qjVRvfBBbGZrpC1IGwBcWxdSZEmn9yUmAYecx43gYK3bz PqeKGAxhuoL7KBmk3VbI7gZ1p7LPdmca74tR5LpruR2u25l7cbFZavtboa8uMkR5uE6u bF6w+NchQXeIjwe3735pkGUu1lpLVSHf642cGZqgtDqaMLOcMRvrE59WeElDEnLSsXWR OeJvSrp0ba/6q419j+RiLECK902A+ur4VZ1wk3tCeyEs9pH5PQ3UVnkVO1BXl15MIbPo oaxq9y3hEkasvi9VL54ClJ2HNy/1kMMqIuGpjpVhY5NXnmN+zlJKCP5MgdDEK5a2Xi6n 6FzQ== X-Gm-Message-State: AOAM533NONL5sLi0dR2tknY+BcLArOAXv2mQvfPDMpfoc8TTOTlTPzol JCBKW+oEZJ1VdGTG/jVyR5AOsAg9cFL5igFo X-Google-Smtp-Source: ABdhPJw30GLGR/7HZv+jhdmimV+ZuLj7fBI8kKkQO3JJwmdLBlGQ4QAg22edWqZUToi7TheOA4mhUg== X-Received: by 2002:a5d:4a4e:: with SMTP id v14mr4586483wrs.80.1612524684243; Fri, 05 Feb 2021 03:31:24 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g16sm8243973wmi.30.2021.02.05.03.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:31:23 -0800 (PST) From: luca.boccassi@gmail.com To: Tyler Retzlaff Cc: dpdk stable Date: Fri, 5 Feb 2021 11:16:46 +0000 Message-Id: <20210205111920.1272063-120-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal/windows: fix C++ compatibility' has been queued to stable release 20.11.1 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 Sender: "stable" 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 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 --- 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@dpdk.org