diff options
| author | Jiaxin Wu <jiaxin.wu@intel.com> | 2016-03-08 16:08:40 +0800 |
|---|---|---|
| committer | Jiaxin Wu <jiaxin.wu@intel.com> | 2016-03-11 08:33:57 +0800 |
| commit | 96c1d788107db60e86c9726c2cbd773b63c91d7d (patch) | |
| tree | 391e02f0596ce91cef429317bcaa1889bc88b305 /NetworkPkg/Application | |
| parent | 7daf2401d420573f50e3d00ae3a89e54914ef056 (diff) | |
| download | edk2-96c1d788107db60e86c9726c2cbd773b63c91d7d.tar.gz edk2-96c1d788107db60e86c9726c2cbd773b63c91d7d.tar.bz2 edk2-96c1d788107db60e86c9726c2cbd773b63c91d7d.zip | |
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 <siyuan.fu@intel.com>
Cc: Zhang Lubo <lubo.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Zhang, Lubo <lubo.zhang@intel.com>
Diffstat (limited to 'NetworkPkg/Application')
| -rw-r--r-- | NetworkPkg/Application/IpsecConfig/IpSecConfig.c | 7 | ||||
| -rw-r--r-- | 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 ff895bccf0..274f582b2b 100644 --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c @@ -1,7 +1,7 @@ /** @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
@@ -26,6 +26,11 @@ #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
//
diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h index 244926f888..8ebc599a12 100644 --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h @@ -1,7 +1,7 @@ /** @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
@@ -27,11 +27,6 @@ #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"
|