diff options
-rw-r--r-- | include/acpi/platform/acenv.h | 13 | ||||
-rw-r--r-- | include/acpi/platform/acenvex.h | 8 | ||||
-rw-r--r-- | include/acpi/platform/aclinux.h | 4 |
3 files changed, 17 insertions, 8 deletions
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index f9af0e03e592..34cce729109c 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h @@ -166,10 +166,21 @@ /****************************************************************************** * * Host configuration files. The compiler configuration files are included - * by the host files. + * first. * *****************************************************************************/ +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) +#include <acpi/platform/acgcc.h> + +#elif defined(_MSC_VER) +#include "acmsvc.h" + +#elif defined(__INTEL_COMPILER) +#include "acintel.h" + +#endif + #if defined(_LINUX) || defined(__linux__) #include <acpi/platform/aclinux.h> diff --git a/include/acpi/platform/acenvex.h b/include/acpi/platform/acenvex.h index 58ca39ce16d4..060fb08e643b 100644 --- a/include/acpi/platform/acenvex.h +++ b/include/acpi/platform/acenvex.h @@ -56,9 +56,6 @@ #if defined(_LINUX) || defined(__linux__) #include <acpi/platform/aclinuxex.h> -#elif defined(WIN32) -#include "acwinex.h" - #elif defined(__DragonFly__) #include "acdragonflyex.h" @@ -72,6 +69,11 @@ #endif +#if defined(_MSC_VER) +#include "acmsvcex.h" + +#endif + /*! [End] no source code translation !*/ #endif /* __ACENVEX_H__ */ diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 1380ec7035f8..a5d98d171866 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -215,8 +215,4 @@ #endif /* __KERNEL__ */ -/* Linux uses GCC */ - -#include <acpi/platform/acgcc.h> - #endif /* __ACLINUX_H__ */ |