Partially fixed up tree after merge from HEAD. More to do.

[reactos.git] / reactos / ntoskrnl / include / internal / ke_x.h

diff --git a/reactos/ntoskrnl/include/internal/ke_x.h b/reactos/ntoskrnl/include/internal/ke_x.h
index 6124312..c0f4de6 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ke_x.h
+++ b/reactos/ntoskrnl/include/internal/ke_x.h
@@ -194,6 +194,9 @@
     }                                                                       \\r
 }\r
 \r
+#undef FORCEINLINE\r
+#define FORCEINLINE\r
+\r
 //\r
 // Recalculates the due time\r
 //\r
@@ -684,10 +687,12 @@ KiRundownThread(IN PKTHREAD Thread)
     {\r
         /* Clear it */\r
         KeGetCurrentPrcb()->NpxThread = NULL;\r
+#ifdef _M_IX86\r
 #ifdef __GNUC__\r
         __asm__("fninit\n\t");\r
 #else\r
         __asm fninit;\r
+#endif\r
 #endif\r
     }\r
 }\r