These files were on my "ignore-on-commit" list.

svn path=/branches/shell-experiments/; revision=63434
This commit is contained in:
David Quintana 2014-05-24 20:58:13 +00:00
parent d5e23caf7a
commit 340c4e472a
2 changed files with 7 additions and 2 deletions

View file

@ -63,6 +63,9 @@ if(NOT CMAKE_CROSSCOMPILING)
if(ARCH STREQUAL "i386") if(ARCH STREQUAL "i386")
add_definitions(/D_X86_ /DWIN32 /D_WINDOWS) add_definitions(/D_X86_ /DWIN32 /D_WINDOWS)
endif() endif()
if(MSVC_VERSION GREATER 1699)
add_definitions(/D_ALLOW_KEYWORD_MACROS)
endif()
add_definitions(/Dinline=__inline) add_definitions(/Dinline=__inline)
else() else()
add_compile_flags("-fshort-wchar -Wno-multichar") add_compile_flags("-fshort-wchar -Wno-multichar")

View file

@ -1432,7 +1432,8 @@ KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save)
#else #else
__asm __asm
{ {
fnsave [FpState] mov eax, [FpState]
fnsave [eax]
}; };
#endif #endif
@ -1458,7 +1459,8 @@ KeRestoreFloatingPointState(IN PKFLOATING_SAVE Save)
__asm __asm
{ {
fnclex fnclex
frstor [FpState] mov eax, [FpState]
frstor [eax]
}; };
#endif #endif