Update DriverConfiguration2.h to avoid the name conflict with DriverConfiguration.h

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2766 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
yshang1 2007-06-27 03:43:06 +00:00
parent 66f0059f35
commit e30e5a72f9
1 changed files with 8 additions and 8 deletions

View File

@ -14,8 +14,8 @@
**/
#ifndef __EFI_DRIVER_CONFIGURATION_H__
#define __EFI_DRIVER_CONFIGURATION_H__
#ifndef __EFI_DRIVER_CONFIGURATION2_H__
#define __EFI_DRIVER_CONFIGURATION2_H__
//
// Global ID for the Driver Configuration Protocol defined in UEFI 2.0
@ -150,8 +150,8 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS) (
IN EFI_DRIVER_CONFIGURATION_PROTOCOL *This,
(EFIAPI *EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS) (
IN EFI_DRIVER_CONFIGURATION2_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
IN EFI_HANDLE ChildHandle OPTIONAL,
IN UINT32 DefaultType,
@ -163,8 +163,8 @@ EFI_STATUS
//
struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {
EFI_DRIVER_CONFIGURATION2_SET_OPTIONS SetOptions;
EFI_DRIVER_CONFIGURATION_OPTIONS_VALID OptionsValid;
EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults;
EFI_DRIVER_CONFIGURATION2_OPTIONS_VALID OptionsValid;
EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS ForceDefaults;
CHAR8 *SupportedLanguages;
};