Merge HAL changes 34743, 34812, 34839, 34917, 35515, 35771, 35902, 35904,

[reactos.git] / reactos / hal / halx86 / include / hal.h

diff --git a/reactos/hal/halx86/include/hal.h b/reactos/hal/halx86/include/hal.h
index 15a8f3f..facbbcf 100644 (file)
--- a/reactos/hal/halx86/include/hal.h
+++ b/reactos/hal/halx86/include/hal.h
@@ -12,14 +12,13 @@
 #include <stdio.h>
 
 /* WDK HAL Compilation hack */
-#ifdef _MSC_VER
 #include <excpt.h>
 #include <ntdef.h>
 #undef _NTHAL_
 #undef DECLSPEC_IMPORT
 #define DECLSPEC_IMPORT
-#define __declspec(dllimport)
-#endif
+#undef NTSYSAPI
+#define NTSYSAPI __declspec(dllimport)
 
 /* IFS/DDK/NDK Headers */
 #include <ntifs.h>
@@ -50,7 +49,4 @@
 #include "mps.h"
 #include "ioapic.h"
 
-/* Helper Header */
-#include <reactos/helper.h>
-
 /* EOF */