Fix GCC build fail issue for MdeModulePkg and NetworkPkg.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / MnpDxe / ComponentName.h

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h
index 0f9057b8de66a1d61b28dbb8d6fa1c083de46655..6232c3e1eda589175cc921442971c76a39b197cb 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h
+++ b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h
@@ -1,10 +1,11 @@
 /** @file\r
   The header file of UEFI Component Name(2) protocol.\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions\r
+of the BSD License which accompanies this distribution.  The full\r
+text of the license may be found at<BR>\r
 http://opensource.org/licenses/bsd-license.php\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
@@ -18,8 +19,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/ComponentName.h>\r
 #include <Protocol/ComponentName2.h>\r
 \r
-extern EFI_COMPONENT_NAME2_PROTOCOL       gMnpComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL        gMnpComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL gMnpComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL  gMnpComponentName;\r
+extern EFI_UNICODE_STRING_TABLE     *gMnpControllerNameTable;\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
@@ -41,7 +43,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL        gMnpComponentName;
                                 languages specified in SupportedLanguages. The\r
                                 number of languages supported by a driver is up\r
                                 to the driver writer. Language is specified\r
-                                in RFC 3066 or ISO 639-2 language code format.\r
+                                in RFC 4646 or ISO 639-2 language code format.\r
 \r
   @param[out]  DriverName       A pointer to the Unicode string to return.\r
                                 This Unicode string is the name of the\r
@@ -63,12 +65,11 @@ extern EFI_COMPONENT_NAME_PROTOCOL        gMnpComponentName;
 EFI_STATUS\r
 EFIAPI\r
 MnpComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
+  IN     CHAR8                         *Language,\r
+     OUT CHAR16                        **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -107,7 +108,7 @@ MnpComponentNameGetDriverName (
                                 languages specified in SupportedLanguages. The\r
                                 number of languages supported by a driver is up\r
                                 to the driver writer. Language is specified in\r
-                                RFC 3066 or ISO 639-2 language code format.\r
+                                RFC 4646 or ISO 639-2 language code format.\r
 \r
   @param[out]  ControllerName   A pointer to the Unicode string to return.\r
                                 This Unicode string is the name of the\r
@@ -116,11 +117,11 @@ MnpComponentNameGetDriverName (
                                 Language from the point of view of the driver\r
                                 specified by This.\r
 \r
-  @retval EFI_SUCCESS           The Unicode string for the user readable name \r
+  @retval EFI_SUCCESS           The Unicode string for the user readable name\r
                                 specified by This, ControllerHandle, ChildHandle,\r
-                                                               and Language was returned in ControllerName.\r
+                                and Language was returned in ControllerName.\r
 \r
-  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.\r
+  @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid\r
                                 EFI_HANDLE.\r
@@ -140,11 +141,11 @@ MnpComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 MnpComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN     EFI_COMPONENT_NAME_PROTOCOL   *This,\r
+  IN     EFI_HANDLE                    ControllerHandle,\r
+  IN     EFI_HANDLE                    ChildHandle        OPTIONAL,\r
+  IN     CHAR8                         *Language,\r
+     OUT CHAR16                        **ControllerName\r
   );\r
 \r
 #endif\r