- _mingw.h: Don't define USE_MINGW_SETJMP_TWO_ARGS for MSVC

- _mingw.h: Fix definition of _CRT_ALIGN for MSVC
- intrin.h: _InterlockedAddLargeStatistic is not an intrinsic on MSVC for x64
- intrin.h: Fix return type of _InterlockedOr64
- wdm.h: Fix warnings in KfRaiseIrql and RtlExtendedMagicDivide inline implementations
- winnt.h: Simplify definition of GetCurrentFiber

svn path=/branches/cmake-bringup/; revision=50470
This commit is contained in:
Timo Kreuzer 2011-01-22 19:17:10 +00:00
parent 1fb963feea
commit 5f6e050626
7 changed files with 27 additions and 52 deletions

View file

@ -7897,7 +7897,7 @@ KfRaiseIrql(IN KIRQL NewIrql)
{
KIRQL OldIrql;
OldIrql = __readcr8();
OldIrql = (KIRQL)__readcr8();
//ASSERT(OldIrql <= NewIrql);
__writecr8(NewIrql);
return OldIrql;
@ -9309,7 +9309,7 @@ RtlExtendedMagicDivide(
ret64 = UnsignedMultiplyHigh(Pos ? Dividend.QuadPart : -Dividend.QuadPart,
MagicDivisor.QuadPart);
ret64 >>= ShiftCount;
ret.QuadPart = Pos ? ret64 : -ret64;
ret.QuadPart = Pos ? ret64 : -(LONG64)ret64;
return ret;
}
#endif