From 43467782015fdd346689d0d4230f3b286816688c Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 28 Mar 2011 11:27:08 +0000
Subject: [PATCH] [CMAKE] move the EXTERN _KiSystemService:PROC from
 syscalls.inc to zw.S. Fixes build of ntdll with MSVC

svn path=/branches/cmake-bringup/; revision=51180
---
 include/asm/syscalls.inc | 2 --
 ntoskrnl/ex/zw.S         | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/asm/syscalls.inc b/include/asm/syscalls.inc
index 19b21423fe3..a0d2832c844 100644
--- a/include/asm/syscalls.inc
+++ b/include/asm/syscalls.inc
@@ -1,6 +1,5 @@
 
 #ifdef _M_IX86
-EXTERN _KiSystemService:PROC
 #define KUSER_SHARED_SYSCALL HEX(7ffe0300)
 #define KGDT_R0_CODE 8
 MACRO(STUBCODE_U, SyscallId, StackBytes)
@@ -18,7 +17,6 @@ MACRO(STUBCODE_K, SyscallId, StackBytes)
     ret StackBytes
 ENDM
 #elif defined(_M_AMD64)
-EXTERN KiSystemService:PROC
 MACRO(STUBCODE_U, SyscallId, StackBytes)
     mov eax, SyscallId
     mov r10, rcx
diff --git a/ntoskrnl/ex/zw.S b/ntoskrnl/ex/zw.S
index c619b9e1c43..bacead4d752 100644
--- a/ntoskrnl/ex/zw.S
+++ b/ntoskrnl/ex/zw.S
@@ -2,6 +2,12 @@
 #include <asm.inc>
 #include <syscalls.inc>
 
+#ifdef _M_IX86
+EXTERN _KiSystemService:PROC
+#elif defined(_M_AMD64)
+EXTERN KiSystemService:PROC
+#endif
+
 .code
 
 SyscallId = 0