diff options
| author | Gary Lin <glin@suse.com> | 2016-07-29 11:25:28 +0800 |
|---|---|---|
| committer | david wei <david.wei@intel.com> | 2016-08-03 11:02:17 +0800 |
| commit | e7643ce70cabf09d89ba069b5460aab5901fa89d (patch) | |
| tree | 5d99a9b0194cc9529682a05c7943acf79b3a1348 /Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h | |
| parent | fe6e53b5ba692463aa5c3daac1788e8375ceef80 (diff) | |
| download | edk2-e7643ce70cabf09d89ba069b5460aab5901fa89d.tar.gz edk2-e7643ce70cabf09d89ba069b5460aab5901fa89d.tar.bz2 edk2-e7643ce70cabf09d89ba069b5460aab5901fa89d.zip | |
Vlv2TbltDevicePkg/AcpiPlatform: Amend the declaration of mGlobalNvsArea
mGlobalNvsArea wasn't declared as extern in AcpiPlatform.h and the header
was included in AcpiPlatform.c and AcpiPlatformHooks.c. Although it's
declared as extern in AcpiPlatformHooks.c, gcc still created an instance
of mGlobalNvsArea in AcpiPlatformHooks.c since the header was expanded
first and then the linker complained "multiple definition". This commit
rearrange the delaration of mGlobalNvsArea to satisfy gcc.
Cc: David Wei <david.wei@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: David Wei <david.wei@intel.com>
Diffstat (limited to 'Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h')
| -rw-r--r-- | Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h index fbc927281f..8587beb976 100644 --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h @@ -59,7 +59,7 @@ Abstract: //
// Global variables.
//
-EFI_GLOBAL_NVS_AREA_PROTOCOL mGlobalNvsArea;
+extern EFI_GLOBAL_NVS_AREA_PROTOCOL mGlobalNvsArea;
//
// ACPI table information used to initialize tables.
|