From patchwork Sun Nov 22 08:45:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Connolly X-Patchwork-Id: 84447 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14AE8A04DC; Sun, 22 Nov 2020 09:45:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E6A48C8E6; Sun, 22 Nov 2020 09:45:34 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 7ACE623D for ; Sun, 22 Nov 2020 09:45:33 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id 23so15310980wrc.8 for ; Sun, 22 Nov 2020 00:45:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mayadata-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QWIYmiOHOGR+PPh8IO0R/CJUMa5YIBHabH/goGiI8d0=; b=OxNWDbiSkHlERj8RjlsFqBJ5JvQc+jcNONYIeQPT3XurvU6AT1eAJCk9iz3mS9yeab b09telskXs5qBff2xoFNvp77HJkLfx+COVxhh+MDwU+gb7sef2w4iS2EAsd1AgHXLIL4 3ZDG8U7ujRjNl4CUEFWP6nqrczw4VXcFr6nyZY8WimjtvuHTWw/QqW0TeW1ZAe8DO25X 2Tk2C2Q7BzkaKN+0DppdoaUFweF5qQwff37F352tKK/dDK6YXpVK/rsQn0u2yhl3qJxt GSwq8Ov7r15lB+KJEjaP2LKIxA6Gnvu1hTXVI47ppUVfQDXyWxIw14JzXmiY/0GN9Ipd Kq1w== 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=QWIYmiOHOGR+PPh8IO0R/CJUMa5YIBHabH/goGiI8d0=; b=uc4oUS6Vgs4/LzGv45P0t4XbxwMU+i8Z8FXSUpheQoVve7Yok/F3FkVj+rq5VTb3tk us3y9Ba7p40oqPHS1/2O760zs56ZT7lEBPdcWpfLL9c+G6dZQdc1rH7kr2pdfWUgzj7I l5aJCQ8GgEfwaLkRawBEju/qGDh+CVWgfIZM4pLgUNjOZDKbaQRg8LxN+ZaR8qsTZndZ FVyaGOH5+yke8gdnXCU48ixtjxev+DAf7MJLJCeTeWaXLmVBkw+9UiyE4iN8M4nfU4Ze 0jlnnFIZDEKigqvHwHQmPqkhbdR0skpcEYWivLZdmRvfbw98l8JPDAta6ApZZBjs0AZU RTyw== X-Gm-Message-State: AOAM532t2DTkBPCsPQ3x6eU4twQNtQzToO/jJu4xC5MwbrZ3Bsxy7oM2 ba/C5fMCQBvU/MCtgqZayGTazA== X-Google-Smtp-Source: ABdhPJyPI5rioYDq3ygvRojBgMwBgQ3Lqf4NhZCJEtu5Tlpx3aNgwiCdN7K3P6MLmEVZbWuULU4Xow== X-Received: by 2002:a5d:6783:: with SMTP id v3mr23974398wru.45.1606034732195; Sun, 22 Nov 2020 00:45:32 -0800 (PST) Received: from FENIX.localdomain (cpc98320-croy25-2-0-cust77.19-2.cable.virginm.net. [80.235.134.78]) by smtp.gmail.com with ESMTPSA id y203sm11401360wmg.9.2020.11.22.00.45.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Nov 2020 00:45:31 -0800 (PST) From: Nick Connolly To: Dmitry Kozlyuk , Narcisa Ana Maria Vasile , Dmitry Malloy , Pallavi Kadam , Tal Shnaiderman Cc: dev@dpdk.org, Nick Connolly , stable@dpdk.org Date: Sun, 22 Nov 2020 08:45:15 +0000 Message-Id: <20201122084515.26348-1-nick.connolly@mayadata.io> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120211255.24803-1-nick.connolly@mayadata.io> References: <20201120211255.24803-1-nick.connolly@mayadata.io> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3] eal/windows: fix link error with MinGW X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Linking with the 'pci' driver when building with MinGW on Windows fails with undefined symbol 'GUID_DEVCLASS_NET'. This occurs because devguid.h is included in rte_windows.h before INITGUID is defined. Move the include of devguid.h after the definition of INITGUID. Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers") Cc: stable@dpdk.org Signed-off-by: Nick Connolly Reviewed-by: Tal Shnaiderman --- v2 * Change Cc to stable@dpdk.org v2 * Fix commit message - add blank line, use present tense lib/librte_eal/windows/include/rte_windows.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h index 0a5e71a05..b82af34f6 100644 --- a/lib/librte_eal/windows/include/rte_windows.h +++ b/lib/librte_eal/windows/include/rte_windows.h @@ -25,13 +25,13 @@ #include #include #include -#include /* Have GUIDs defined. */ #ifndef INITGUID #define INITGUID #endif #include +#include #include /**