Author: dquintana Date: Sat May 24 20:58:13 2014 New Revision: 63434
URL: http://svn.reactos.org/svn/reactos?rev=63434&view=rev Log: These files were on my "ignore-on-commit" list.
Modified: branches/shell-experiments/CMakeLists.txt branches/shell-experiments/ntoskrnl/ke/i386/cpu.c
Modified: branches/shell-experiments/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/CMakeLists.txt... ============================================================================== --- branches/shell-experiments/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/CMakeLists.txt [iso-8859-1] Sat May 24 20:58:13 2014 @@ -62,6 +62,9 @@ if(MSVC) if(ARCH STREQUAL "i386") add_definitions(/D_X86_ /DWIN32 /D_WINDOWS) + endif() + if(MSVC_VERSION GREATER 1699) + add_definitions(/D_ALLOW_KEYWORD_MACROS) endif() add_definitions(/Dinline=__inline) else()
Modified: branches/shell-experiments/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ke/i3... ============================================================================== --- branches/shell-experiments/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ branches/shell-experiments/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat May 24 20:58:13 2014 @@ -1432,7 +1432,8 @@ #else __asm { - fnsave [FpState] + mov eax, [FpState] + fnsave [eax] }; #endif
@@ -1458,7 +1459,8 @@ __asm { fnclex - frstor [FpState] + mov eax, [FpState] + frstor [eax] }; #endif