From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.85.128.68; helo=mail-wm1-f68.google.com; envelope-from=philmd@redhat.com; receiver=edk2-devel@lists.01.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) (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 E2D9C21B02822 for ; Mon, 4 Feb 2019 04:06:26 -0800 (PST) Received: by mail-wm1-f68.google.com with SMTP id y185so9919264wmd.1 for ; Mon, 04 Feb 2019 04:06:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=t7nBj5RC/we4HW1i4mtM4RH+2LXaOu/2+3Y5tLtoHDc=; b=B1hAPxPIPqJSPudwx/hjixqjTPQoD2TOZ14kQ2ML+8mNOCSuEXpq06jugPZdzsBHs9 XFVX7kWQyu0xuO38ZVQ8LZ84357OvmYB8NDwsF8ZAPvKKfAmzV3Y3jLQkLHH6WMUJsNC 3g9RScnk3UFdf+5MDIi3ZiOWnt6gT7PkWdS+tOFFya+v12tUlrKa2RRYQGePBxGrBka7 fhe88Jf3ES+0MQqQKK1SUJjuayjN0UF1Wj2yF9Dx4jMkz9p7dCg+xz31K6U1cAcrkOuX IDdHbxGPkUeVhe70st/cTOmqCOGFiEBNUF6Up65ZTxVNKEVrmbz4ocvakKPxChMTfugv bmQg== X-Gm-Message-State: AHQUAuZjvYNy5FuV4wWJuNyF0ULkBD+CigvKLTmvEbPrXgoGnZ9gvD7m kL+8JiscZtFiJbhFdCGN1etWzw== X-Google-Smtp-Source: AHgI3Iaabp/5xyf2EWNVCnu7+zm9B9ZqX300L6gk4PISA4MK7jjtF82IiYtJO/WdT9wRyw/GjMS5EQ== X-Received: by 2002:a1c:7dd7:: with SMTP id y206mr13101301wmc.50.1549281985299; Mon, 04 Feb 2019 04:06:25 -0800 (PST) Received: from [192.168.1.33] (110.red-83-51-161.dynamicip.rima-tde.net. [83.51.161.110]) by smtp.gmail.com with ESMTPSA id m15sm19151622wrr.95.2019.02.04.04.06.24 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 04:06:24 -0800 (PST) To: Leif Lindholm , edk2-devel@lists.01.org Cc: "Kinney, Michael D" , Jaben Carsey , Daryl McDaniel References: <20181102105015.3609-1-leif.lindholm@linaro.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE; url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE Message-ID: <49389dbc-1060-783c-8766-283f9e742a5d@redhat.com> Date: Mon, 4 Feb 2019 13:06:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20181102105015.3609-1-leif.lindholm@linaro.org> Subject: Re: [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: , X-List-Received-Date: Mon, 04 Feb 2019 12:06:27 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit On 11/2/18 11:50 AM, Leif Lindholm wrote: > 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 Reviewed-by: Philippe Mathieu-Daudé > --- > > 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(-) > > 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 > >