From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org
Cc: maciej.rabeda@intel.com, michael.d.kinney@intel.com,
eric.jin@intel.com, leif.lindholm@linaro.org,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH edk2-staging 11/19] IntelUndiPkg/GigUndiDxe: fix incorrect use of CPP token pasting
Date: Tue, 6 Nov 2018 18:58:25 +0100 [thread overview]
Message-ID: <20181106175833.26964-12-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20181106175833.26964-1-ard.biesheuvel@linaro.org>
The ## CPP token pasting operator is used to paste *tokens*, which
is not the same thing as pasting arbitrary macro arguments. Since a
token cannot contain . or ) characters in the first place, using
the ## operator here is wrong and unnecessary, so just remove it.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
IntelUndiPkg/GigUndiDxe/NVDataStruc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h
index 72f6a95ccb6d..04f08b41c842 100644
--- a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h
+++ b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h
@@ -112,7 +112,7 @@ typedef struct {
@return Width of given field is returned
**/
-#define UNDI_CONFIG_WIDTH(Field) sizeof (UndiPrivateData->Configuration. ## Field ## )
+#define UNDI_CONFIG_WIDTH(Field) sizeof (UndiPrivateData->Configuration.Field)
// General parameters
#define QUESTION_ID_EFI_DRIVER_VER 0x1100
--
2.19.1
next prev parent reply other threads:[~2018-11-06 17:59 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 17:58 [PATCH edk2-staging 00/19] IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 01/19] IntelOpenSourceUndiPkg.dsc: add AARCH64 and ARM to supported architectures Ard Biesheuvel
2019-01-29 13:54 ` Ryszard Knop
2019-01-29 14:04 ` Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 02/19] IntelUndiPkg: remove EOF markers Ard Biesheuvel
2018-11-06 19:34 ` Philippe Mathieu-Daudé
2019-01-29 13:58 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 03/19] IntelUndiPkg/GigUndiDxe: consistently use lowercase for e1000 in filenames Ard Biesheuvel
2018-11-06 19:35 ` Philippe Mathieu-Daudé
2019-01-29 14:21 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 04/19] IntelUndiPkg/GigUndiDxe: consistently use forward slashes as path separators Ard Biesheuvel
2018-11-06 19:37 ` Philippe Mathieu-Daudé
2019-01-29 14:26 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 05/19] IntelUndiPkg/GigUndiDxe: move BRAND_STRUCT declaration after type definition Ard Biesheuvel
2019-01-29 16:02 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 06/19] IntelUndiPkg/GigUndiDxe: use intermediate UINTN casts for pointers Ard Biesheuvel
2019-01-30 10:59 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 07/19] IntelUndiPkg/GigUndiDxe: create GCC alternatives for MSFT build options Ard Biesheuvel
2019-01-30 11:48 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 08/19] IntelUndiPkg/GigUndiDxe: add missing VOID** cast Ard Biesheuvel
2018-11-07 9:16 ` Philippe Mathieu-Daudé
2018-11-07 14:05 ` Philippe Mathieu-Daudé
2019-01-30 12:05 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 09/19] IntelUndiPkg/GigUndiDxe: add missing UINT8* cast Ard Biesheuvel
2018-11-06 20:31 ` Philippe Mathieu-Daudé
2018-11-06 20:35 ` Ard Biesheuvel
2018-11-07 9:08 ` Philippe Mathieu-Daudé
2019-01-30 12:37 ` Ryszard Knop
2019-01-30 12:30 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 10/19] IntelUndiPkg/GigUndiDxe: add missing braces to GUID literals Ard Biesheuvel
2018-11-06 20:34 ` Philippe Mathieu-Daudé
2019-01-30 12:59 ` Ryszard Knop
2018-11-06 17:58 ` Ard Biesheuvel [this message]
2019-01-30 13:35 ` [PATCH edk2-staging 11/19] IntelUndiPkg/GigUndiDxe: fix incorrect use of CPP token pasting Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 12/19] IntelUndiPkg/GigUndiDxe: cast E1000MemCopy () args to correct pointer type Ard Biesheuvel
2018-11-06 20:35 ` Philippe Mathieu-Daudé
2019-01-30 13:37 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 13/19] IntelUndiPkg/GigUndiDxe: don't take address of cast expression Ard Biesheuvel
2018-11-06 20:36 ` Philippe Mathieu-Daudé
2019-01-30 13:41 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 14/19] IntelUndiPkg/GigUndiDxe: redefine UNREFERENCED_nPARAMETER macros for GCC Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 15/19] IntelUndiPkg/GigUndiDxe: remove forward declaration of non-existent function Ard Biesheuvel
2018-11-06 20:40 ` Philippe Mathieu-Daudé
2019-01-30 15:26 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 16/19] IntelUndiPkg/GigUndiDxe: fix incorrect indentation Ard Biesheuvel
2018-11-06 20:41 ` Philippe Mathieu-Daudé
2018-11-06 17:58 ` [PATCH edk2-staging 17/19] IntelUndiPkg/GigUndiDxe: move MSFT warning overrides to INF file Ard Biesheuvel
2019-01-30 14:09 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 18/19] IntelUndiPkg/GigUndiDxe: add missing EFIAPI modifiers Ard Biesheuvel
2019-01-30 15:15 ` Ryszard Knop
2019-01-30 15:20 ` Ard Biesheuvel
2019-01-30 15:31 ` Ryszard Knop
2019-01-30 15:33 ` Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 19/19] IntelUndiPkg/GigUndiDxe: remove or reorganize unused variables Ard Biesheuvel
2018-11-07 9:08 ` Philippe Mathieu-Daudé
2019-01-30 14:32 ` Ryszard Knop
2018-11-06 22:10 ` [PATCH edk2-staging 00/19] IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC Kinney, Michael D
2018-11-06 23:03 ` Ard Biesheuvel
2018-11-09 17:54 ` Knop, Ryszard
2018-11-09 18:00 ` Ard Biesheuvel
2018-11-07 14:56 ` Leif Lindholm
2019-01-29 13:13 ` Ryszard Knop
2019-01-29 13:55 ` Ryszard Knop
2019-03-27 15:32 ` Ard Biesheuvel
2019-03-28 10:46 ` Ryszard Knop
2019-03-28 11:38 ` Ard Biesheuvel
2020-01-07 12:49 ` [edk2-devel] " Maciej Rabeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181106175833.26964-12-ard.biesheuvel@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox