Commit e323c02d authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki

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/9bb265c2Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 4e2fc6a0
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
#ifndef _ACAPPS #ifndef _ACAPPS
#define _ACAPPS #define _ACAPPS
#ifdef ACPI_USE_STANDARD_HEADERS
#include <sys/stat.h>
#endif /* ACPI_USE_STANDARD_HEADERS */
/* Common info for tool signons */ /* Common info for tool signons */
#define ACPICA_NAME "Intel ACPI Component Architecture" #define ACPICA_NAME "Intel ACPI Component Architecture"
......
...@@ -350,7 +350,8 @@ ...@@ -350,7 +350,8 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <time.h>
#include <signal.h>
#endif #endif
#endif /* ACPI_USE_STANDARD_HEADERS */ #endif /* ACPI_USE_STANDARD_HEADERS */
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include "accommon.h" #include "accommon.h"
#include "actables.h" #include "actables.h"
#include "acapps.h"
/* Globals */ /* Globals */
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
*/ */
#include "acpidump.h" #include "acpidump.h"
#include "acapps.h"
/* Local prototypes */ /* Local prototypes */
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#define _DECLARE_GLOBALS #define _DECLARE_GLOBALS
#include "acpidump.h" #include "acpidump.h"
#include "acapps.h"
/* /*
* acpidump - A portable utility for obtaining system ACPI tables and dumping * acpidump - A portable utility for obtaining system ACPI tables and dumping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment