Sync to trunk HEAD (r43416)

[reactos.git] / reactos / include / ddk / wdm.h

diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index 746341b..2b7492d 100644 (file)
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -542,6 +542,13 @@ InterlockedAdd64(
     return InterlockedExchangeAdd64(Addend, Value) + Value;
 }
 //#endif
+#define BitScanForward _BitScanForward
+#define BitScanReverse _BitScanReverse
+#endif
+
+#ifdef _M_AMD64
+#define InterlockedBitTestAndSet64 _interlockedbittestandset64
+#define InterlockedBitTestAndReset64 _interlockedbittestandreset64
 #endif
 
 #endif /* !__INTERLOCKED_DECLARED */
@@ -573,7 +580,7 @@ InterlockedAdd64(
 #define PSLIST_ENTRY PSINGLE_LIST_ENTRY
 
 #if defined(_WIN64)
-typedef union _SLIST_HEADER {
+typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER {
     struct {
         ULONGLONG Alignment;
         ULONGLONG Region;