Author: tkreuzer Date: Mon Mar 28 11:27:08 2011 New Revision: 51180
URL: http://svn.reactos.org/svn/reactos?rev=51180&view=rev Log: [CMAKE] move the EXTERN _KiSystemService:PROC from syscalls.inc to zw.S. Fixes build of ntdll with MSVC
Modified: branches/cmake-bringup/include/asm/syscalls.inc branches/cmake-bringup/ntoskrnl/ex/zw.S
Modified: branches/cmake-bringup/include/asm/syscalls.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/syscal... ============================================================================== --- branches/cmake-bringup/include/asm/syscalls.inc [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/syscalls.inc [iso-8859-1] Mon Mar 28 11:27:08 2011 @@ -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 @@ ret StackBytes ENDM #elif defined(_M_AMD64) -EXTERN KiSystemService:PROC MACRO(STUBCODE_U, SyscallId, StackBytes) mov eax, SyscallId mov r10, rcx
Modified: branches/cmake-bringup/ntoskrnl/ex/zw.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/zw.S?r... ============================================================================== --- branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] Mon Mar 28 11:27:08 2011 @@ -1,6 +1,12 @@
#include <asm.inc> #include <syscalls.inc> + +#ifdef _M_IX86 +EXTERN _KiSystemService:PROC +#elif defined(_M_AMD64) +EXTERN KiSystemService:PROC +#endif
.code