diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2016-08-04 10:44:59 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-08-13 03:09:35 +0200 |
| commit | e323c02dee59af7da65637852f6fa95551325d80 (patch) | |
| tree | e9a77755a6a415235a088ce8ef1dd9114914c1d4 | |
| parent | ACPICA: Clib/EFI: Fix wrong order of standard integer types/IO handles (diff) | |
| download | linux-e323c02dee59af7da65637852f6fa95551325d80.tar.xz linux-e323c02dee59af7da65637852f6fa95551325d80.zip | |
ACPICA: MSVC9: Fix <sys/stat.h> inclusion order issue
ACPICA commit 9bb265c2afb9910e46f820d6759648580edabd09
When /Za is specified, headers of some Windows SDKs contain bugs breaking
VC builds, and MSVC9's default SDK is one of such header-buggy library.
In order to solve this issue, many VC developers stop using /Za. However
we've been asked to have this fixed without removing /Za.
In MSVC9 default SDK, this issue can be fixed by restricting <sys/stat.h>
to be the last standard file included by every source file in the projects.
This patch thus moves <sys/stat.h> inclusion to "acapps.h", so that this
issue can be fixed by ensuring that "acapps.h" is always the last standard
file included by all of the ACPICA source files. This is in fact also a
useful cleanup because applications can only include one header (e.x.,
acpidump.h) instead of including acapps.h separately. Lv Zheng.
Except some harmless header inclusion re-ordering, Linux kernel is not
affected by this change.
Link: https://github.com/acpica/acpica/commit/9bb265c2
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/acpica/acapps.h | 4 | ||||
| -rw-r--r-- | include/acpi/platform/acenv.h | 3 | ||||
| -rw-r--r-- | tools/power/acpi/tools/acpidump/acpidump.h | 1 | ||||
| -rw-r--r-- | tools/power/acpi/tools/acpidump/apfiles.c | 1 | ||||
| -rw-r--r-- | tools/power/acpi/tools/acpidump/apmain.c | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/acapps.h b/drivers/acpi/acpica/acapps.h index 247f30c33e21..bc385347932e 100644 --- a/drivers/acpi/acpica/acapps.h +++ b/drivers/acpi/acpica/acapps.h @@ -44,6 +44,10 @@ #ifndef _ACAPPS #define _ACAPPS +#ifdef ACPI_USE_STANDARD_HEADERS +#include <sys/stat.h> +#endif /* ACPI_USE_STANDARD_HEADERS */ + /* Common info for tool signons */ #define ACPICA_NAME "Intel ACPI Component Architecture" diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index 1e2fe9501c16..3dbfa27424ea 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h @@ -350,7 +350,8 @@ #include <stdio.h> #include <fcntl.h> #include <errno.h> -#include <sys/stat.h> +#include <time.h> +#include <signal.h> #endif #endif /* ACPI_USE_STANDARD_HEADERS */ diff --git a/tools/power/acpi/tools/acpidump/acpidump.h b/tools/power/acpi/tools/acpidump/acpidump.h index 9f7db006f326..00423fc45e7c 100644 --- a/tools/power/acpi/tools/acpidump/acpidump.h +++ b/tools/power/acpi/tools/acpidump/acpidump.h @@ -55,6 +55,7 @@ #include <acpi/acpi.h> #include "accommon.h" #include "actables.h" +#include "acapps.h" /* Globals */ diff --git a/tools/power/acpi/tools/acpidump/apfiles.c b/tools/power/acpi/tools/acpidump/apfiles.c index c52752126462..44a0010d16c9 100644 --- a/tools/power/acpi/tools/acpidump/apfiles.c +++ b/tools/power/acpi/tools/acpidump/apfiles.c @@ -42,7 +42,6 @@ */ #include "acpidump.h" -#include "acapps.h" /* Local prototypes */ diff --git a/tools/power/acpi/tools/acpidump/apmain.c b/tools/power/acpi/tools/acpidump/apmain.c index cd6c097b6a89..17ce0d7ef29d 100644 --- a/tools/power/acpi/tools/acpidump/apmain.c +++ b/tools/power/acpi/tools/acpidump/apmain.c @@ -43,7 +43,6 @@ #define _DECLARE_GLOBALS #include "acpidump.h" -#include "acapps.h" /* * acpidump - A portable utility for obtaining system ACPI tables and dumping |