[edk2,edk2-staging,09/20] IntelUndiPkg/XGigUndiDxe: fix incorrect use of CPP token pasting

Message ID 20181115023353.20159-10-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • IntelUndiPkg/XGigUndiDxe: fix GCC / ARM build issues
Related show

Commit Message

Ard Biesheuvel Nov. 15, 2018, 2:33 a.m.
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/XGigUndiDxe/NVDataStruc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.17.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ryszard Knop Jan. 30, 2019, 4:06 p.m. | #1
Reviewed-by: Ryszard Knop <ryszard.knop@linux.intel.com>


On Wed, 2018-11-14 at 18:33 -0800, ard.biesheuvela wrote:
> 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 at linaro.org>

> ---

>  IntelUndiPkg/XGigUndiDxe/NVDataStruc.h | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h

> b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h

> index 63dd841277ab..c78d26da7869 100644

> --- a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h

> +++ b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h

> @@ -113,7 +113,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                          0x11

> 00


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
index 63dd841277ab..c78d26da7869 100644
--- a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
+++ b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
@@ -113,7 +113,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