From patchwork Fri Nov 20 21:12:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Connolly X-Patchwork-Id: 84442 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 4A5E2A04DD; Fri, 20 Nov 2020 22:14:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F26DCF90; Fri, 20 Nov 2020 22:14:00 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by dpdk.org (Postfix) with ESMTP id C706DDED for ; Fri, 20 Nov 2020 22:13:59 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id h21so11283885wmb.2 for ; Fri, 20 Nov 2020 13:13:59 -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:mime-version :content-transfer-encoding; bh=/UXRFSTR16q6GxqNtLs1ZljEWJmcgZxOCdtuJGHeRFA=; b=S/8em2bo1dNqL1w+kTMo89UYgV1PLTkoiX3IdAOE0s86vZ+82R9JwFwW7XP/zh4AVE OfPbbSh2yA9J7XcuOaDehc4TB0XclvBcJYZ/IXWzcOnSSzTxQ69MkscIz0d2bmzoIb/L QO6NW9SKateyBFdqTnjBqjgyw+37iTbK4nkzEh27Uvc6g17J6AoMAWw5RmQPnj55Le7t JL5C/S+3Sinc1jqMRbHnQ5DUzdUSV2upJM/6qr2TmrINFnxKi2acG1hqkK5uoEugcuxU D8AGUkviWa72k4NqVQMixtjRM4swVINMMmS+/wHa37ZKXG/2b8ydRvNTxo6FyLnXBRQq ToAA== 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:mime-version :content-transfer-encoding; bh=/UXRFSTR16q6GxqNtLs1ZljEWJmcgZxOCdtuJGHeRFA=; b=g6CGITIjkHzB45X2va13b74XZbkLH+FAMaPudMkdYQ7Vm0Nr1MO8f4AtQmzQjw+AdQ gQkFGRAUTkiS6ONrzcNKuivilX0kZEOcua0lcKe+ErTccC+4wT2RENf4NFeqI5+4njNF 3eo5yqg0eWGc0Gc61lKf/wTmUEcxRxDXLdPzinzGonAPQNLgNL5jIxEsLxqhaq2vUrrS Fu9spx4761EK9OwrTt22AYug6Vwy4r1nGAKdaMzWNXQgh7l+PyXw/AaNh3d//ez1XWya SoIK8qwtxdtnPK9abm8FIcQpLHiDn5sN3ZOC+6rMFrXRADl7vfLq5wGylpsbOi5Ow/6w bUMg== X-Gm-Message-State: AOAM530UlaTFbOjpPT7dAtkrO2P3M7lU2Fg5247UxBh7wrcEOsJH0Q7W vmi7vOQ7wN7Qup6QAsDaM8awlQ== X-Google-Smtp-Source: ABdhPJzxy2s3CTNFes6CbNl6ma+sZJpAw/eplE/Sh+F/vXWRDXQZHDNNrikOT0KRjHQlxK2DC0wdmQ== X-Received: by 2002:a05:600c:2886:: with SMTP id g6mr11995155wmd.110.1605906838303; Fri, 20 Nov 2020 13:13:58 -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 a15sm6349581wrn.75.2020.11.20.13.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 13:13:57 -0800 (PST) From: Nick Connolly To: Dmitry Kozlyuk , Narcisa Ana Maria Vasile , Dmitry Malloy , Pallavi Kadam , Tal Shnaiderman Cc: dev@dpdk.org, Nick Connolly Date: Fri, 20 Nov 2020 21:12:55 +0000 Message-Id: <20201120211255.24803-1-nick.connolly@mayadata.io> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] 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. Resolved by moving the include of devguid.h after the definition of INITGUID. Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers") Cc: talshn@mellanox.com Signed-off-by: Nick Connolly Acked-by: Dmitry Kozlyuk --- 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 /**