[ros-diffs] [reactos] 01/01: [HALX86:ACPI] Use the correct PCH file for compilation.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5d17a0219f2a198e2923…

commit e5d17a0219f2a198e2923d0070bb43133d747191
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sat Apr 9 20:18:03 2022 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sat Apr 9 20:18:03 2022 +0200

    [HALX86:ACPI] Use the correct PCH file for compilation.
    
    This also removes the following warnings, that were present because,
    as the ACPICA acpi.h header was used as PCH (instead of none, or the
    hal's own main header), it was "included" before any other header
    -- and in particular, before hal.h -- and as a result, colliding defines
    were still defined even if the #undef tricks were used for them.
    
    rosbuilds\sdk\include\reactos\mc\bugcodes.h(1417): warning C4005:
'ACPI_BIOS_ERROR': macro redefinition
    reactos\drivers\bus\acpi\acpica\include\acoutput.h(243): note: see previous definition
of 'ACPI_BIOS_ERROR'
    reactos\hal\halx86\include\hal.h(41): warning C4109: unexpected identifier
'_read'
    reactos\hal\halx86\include\hal.h(42): warning C4109: unexpected identifier
'_read'
---
 hal/halx86/acpi.cmake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hal/halx86/acpi.cmake b/hal/halx86/acpi.cmake
index e35cab24e4a..600fac13ca3 100644
--- a/hal/halx86/acpi.cmake
+++ b/hal/halx86/acpi.cmake
@@ -14,7 +14,5 @@ if(ARCH STREQUAL "amd64")
 endif()
 
 add_library(lib_hal_acpi OBJECT ${HAL_ACPI_SOURCE})
-add_pch(lib_hal_acpi ${REACTOS_SOURCE_DIR}/drivers/bus/acpi/acpica/include/acpi.h
${HAL_ACPI_SOURCE})
+add_pch(lib_hal_acpi include/hal.h ${HAL_ACPI_SOURCE})
 add_dependencies(lib_hal_acpi bugcodes xdk)
-#add_pch(lib_hal_acpi include/hal.h)
-