Reviewed-by: Fu Siyuan <[email protected]> > -----Original Message----- > From: Wu, Jiaxin > Sent: Wednesday, March 9, 2016 8:59 AM > To: [email protected] > Cc: Fu, Siyuan <[email protected]>; Zhang, Lubo <[email protected]> > Subject: [Patch] NetworkPkg: Fix IpsecConfig GCC build failure issue > > This issue is caused by the string token ID for help message, > which is defined in the internal head file. > This head file is used for reference more than once. So, > multiple definition for the string token ID error will be > enrolled. > > Cc: Fu Siyuan <[email protected]> > Cc: Zhang Lubo <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jiaxin Wu <[email protected]> > --- > NetworkPkg/Application/IpsecConfig/IpSecConfig.c | 7 ++++++- > NetworkPkg/Application/IpsecConfig/IpSecConfig.h | 7 +------ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c > b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c > index ff895bc..274f582 100644 > --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c > +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c > @@ -1,9 +1,9 @@ > /** @file > The main process for IpSecConfig application. > > - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR> > > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > which accompanies this distribution. The full text of the license may be > found at > http://opensource.org/licenses/bsd-license.php. > @@ -24,10 +24,15 @@ > #include "PolicyEntryOperation.h" > #include "Delete.h" > #include "Helper.h" > > // > +// String token ID of IpSecConfig command help message text. > +// > +GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID > mStringIpSecHelpTokenId = STRING_TOKEN (STR_IPSEC_CONFIG_HELP); > + > +// > // Used for ShellCommandLineParseEx only > // and to ensure user inputs are in valid format > // > SHELL_PARAM_ITEM mIpSecConfigParamList[] = { > { L"-p", TypeValue }, > diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h > b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h > index 244926f..8ebc599 100644 > --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h > +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h > @@ -1,9 +1,9 @@ > /** @file > The internal structure and function declaration in IpSecConfig application. > > - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR> > > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > which accompanies this distribution. The full text of the license may be > found at > http://opensource.org/licenses/bsd-license.php. > @@ -25,15 +25,10 @@ > #include <Library/UefiHiiServicesLib.h> > #include <Library/NetLib.h> > > #include <Protocol/IpSecConfig.h> > > -// > -// String token ID of VConfig command help message text. > -// > -GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID > mStringIpSecHelpTokenId = STRING_TOKEN (STR_IPSEC_CONFIG_HELP); > - > #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) > > #define IPSECCONFIG_STATUS_NAME L"IpSecStatus" > > #define BIT(x) (UINT32) (1 << (x)) > -- > 1.9.5.msysgit.1
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
