From patchwork Fri Nov 2 10:50:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 150021 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1922720ljp; Fri, 2 Nov 2018 03:55:50 -0700 (PDT) X-Google-Smtp-Source: AJdET5fW0GZ+6Rvq78Axr7v5E9tBUf4aI8T01nnnvByeH+x1lnLnAusC9TiIuZkFvfDGfUAzVetO X-Received: by 2002:a62:ce8e:: with SMTP id y136-v6mr11436763pfg.201.1541156150604; Fri, 02 Nov 2018 03:55:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541156150; cv=none; d=google.com; s=arc-20160816; b=gX/yzcrU0k5XaW01OQHvXH3yt+VJTpS+LYD4sEF/BFooAfcmkVh9wooOJLwAy5gIv3 KwMBhSHKS3zhD9EOoeV+zYUaIuRtxeK+zJPotnXHmcj4+Hkkg4KeFW0vKLnR8Y6IUtw2 BY4ZNcF0iQ9Zot3AYkYq02A0DvKnnZ+hAj5GNkc6hSMLNwhxld9HvVUef8rsJYOUKXSm 3uIn3SVnQTw8NT9cYy08i3fBIKvAVwzKiOfdTvCsXbKDygZFMdFEMY+ukqj6lT5ecgMc q0XGvSU0hr1pA8QjPmFlSzocREK6Ue6aVheX5yoyDGmI2gdiaNUw2YdVCkBL2DNRvOoN Tyxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=+uBX+ufpvWhVtk4VrZYUX3NMlxFhNqI3Ibjq7InRf5U=; b=Ay+IjlEvS5Bw1KvGGBJxI0e15hzsCBKKxz5RqQBjsv/X6kCD+lAKMkC8ZvPERv0L9J GPaWcWV9RnV1rTdtsOOjsSY7E0Nqzf988b4yCb3H3Jpt8zNy/xyJ/B4gaZjYQLsar76i WiGp9FtWZMe7ssHugRgXVmqPrH8pbPbCWuNUscWBsLq6OqxUn6K99FCH6reAnEQVI04t ZDZag/Gz23FBbjdAZXqlMnvgoJOFQ+bJrDHgqHfLKHlomjSgCinbH4AovkXPQqqIpgPL nNtuyGB533DYtayrMujbXybfLlqrM03pENl2WV13cL5OsynpmxGFlFsHSp3d7laIkQa8 kRWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WxpqRbQM; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id t130si6002584pgb.521.2018.11.02.03.55.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 03:55:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WxpqRbQM; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C07712118B645; Fri, 2 Nov 2018 03:55:48 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A3A4B2118847C for ; Fri, 2 Nov 2018 03:50:19 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id y3-v6so1201074wrh.10 for ; Fri, 02 Nov 2018 03:50:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Y6l5qaWmUzliVvZCu/IogDng6ebyI93qEN75QhZdpiM=; b=WxpqRbQMnLzSh/0Oc6JH72RUobzIaSkZ3UzCk8mV+ddJoslfcjx4AompuR0SuMY55X 1q3El9tx7H3IqMPMJdaSasUcgRei2DOc7FVmfTFNcNxpmwO8WRZfkOUpZImfAaGbQ+4e SzI5UlRS+v+rPrRzepNi2Br594PGLxpkBf+Qg= 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; bh=Y6l5qaWmUzliVvZCu/IogDng6ebyI93qEN75QhZdpiM=; b=oYOlGFHaQ77LIqKa36BQvbabGVdEOtg92/OeleEL3lUvxMN0qeWkdOqFWJatZK+OC1 UqSDLlEvCEKaRX3rCGKcMC/YKbyHXutdEQ/JtmXE4Jh+ow2SRw2CW8W2DYWOE/RVdfjw kSwnJl5mqsgPiZZwXZ/vk47yyrUiRYYwaoHV+AtkDHGAd9fjfyz7ONrH/Qy59pC5Hja4 MHVxD0cFKIJUJr0N97/xh51xo16w9k3i6gsuSvz4jB9VGHx0HBB75BQl+bS1Elrh4J4h 0puylLGmt2H0dGUN1A2ZxPJ3TiKItSSyuNuy4Pkwagjt1b/7ERMo3mB8PPXztiqCb1ZZ LAdA== X-Gm-Message-State: AGRZ1gIq7LaKLvBraU5IHbkY6G0bOWUm1oXqFtb8yT3dzYIjYTxGUjyT lF0GVzsVXFHqoXAxuIWERuTKktTrsxQ= X-Received: by 2002:adf:dbc3:: with SMTP id e3-v6mr10255568wrj.165.1541155817346; Fri, 02 Nov 2018 03:50:17 -0700 (PDT) Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id q190-v6sm37469813wmg.40.2018.11.02.03.50.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 03:50:16 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Fri, 2 Nov 2018 10:50:15 +0000 Message-Id: <20181102105015.3609-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [edk2] [PATCH v2] AppPkg: fix webserver build for !Ia32/X64 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Kinney, Michael D" , Jaben Carsey , Daryl McDaniel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The WebServer application is not meant to be Ia32/X64 specific, and would build for other architectures, if it wasn't for the #include in WebServer.h. Move that statement to Mtrr.c instead, which is the only consumer, and is already being filtered out for other architectures. Cc: Daryl McDaniel Cc: Jaben Carsey Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- Resending only 1/6, since the others got R-b already. Looking at PageList.c, the app was clearly intended to be portable, so updated commit message to reflect this. AppPkg/Applications/Sockets/WebServer/WebServer.h | 1 - AppPkg/Applications/Sockets/WebServer/Mtrr.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Jaben Carsey diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h b/AppPkg/Applications/Sockets/WebServer/WebServer.h index 21b07b63df..16c30c8d6d 100644 --- a/AppPkg/Applications/Sockets/WebServer/WebServer.h +++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h @@ -20,7 +20,6 @@ #include -#include #include #include #include diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c b/AppPkg/Applications/Sockets/WebServer/Mtrr.c index 54356bde64..4b8482d4e2 100644 --- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c +++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c @@ -15,6 +15,7 @@ #include #include +#include #define VARIABLE_MTRR_VALID 0x800