VirtualBox

Changeset 106222 in vbox


Ignore:
Timestamp:
Oct 7, 2024 8:42:18 AM (8 weeks ago)
Author:
vboxsync
Message:

iprt/nt/wdm.h,ntddk.h: Reduce the _interlockedXxxx workarounds as it looks like it's mostly been sorted out by now (VC 2019, WDK 22000 & W7).

Location:
trunk/include/iprt/nt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/iprt/nt/ntddk.h

    r106061 r106222  
    4343#include <iprt/sanitized/intrin.h>
    4444
    45 #define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
    46 #define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
    47 #define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
    48 #define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
    49 #define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
    50 #define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
    51 #define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
    52 #define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
     45#ifdef _M_IX86
     46# define _InterlockedAddLargeStatistic _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
     47#endif
    5348
    5449#pragma warning(push)
     
    7166#pragma warning(pop)
    7267
    73 #undef  _InterlockedExchange
    74 #undef  _InterlockedExchangeAdd
    75 #undef  _InterlockedCompareExchange
    76 #undef  _InterlockedAddLargeStatistic
    77 #undef  _interlockedbittestandset
    78 #undef  _interlockedbittestandreset
    79 #undef  _interlockedbittestandset64
    80 #undef  _interlockedbittestandreset64
     68#ifdef _M_IX86
     69# undef _InterlockedAddLargeStatistic
     70#endif
    8171
    8272#endif /* !IPRT_INCLUDED_nt_ntddk_h */
  • trunk/include/iprt/nt/wdm.h

    r106061 r106222  
    4343#include <iprt/sanitized/intrin.h>
    4444
    45 #define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
    46 #define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
    47 #define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
    48 #define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
    49 #define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
    50 #define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
    51 #define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
    52 #define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
     45#ifdef _M_IX86
     46# define _InterlockedAddLargeStatistic _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
     47#endif
    5348
    5449#pragma warning(push)
     
    6964#pragma warning(pop)
    7065
    71 #undef  _InterlockedExchange
    72 #undef  _InterlockedExchangeAdd
    73 #undef  _InterlockedCompareExchange
    74 #undef  _InterlockedAddLargeStatistic
    75 #undef  _interlockedbittestandset
    76 #undef  _interlockedbittestandreset
    77 #undef  _interlockedbittestandset64
    78 #undef  _interlockedbittestandreset64
     66#ifdef _M_IX86
     67# undef  _InterlockedAddLargeStatistic
     68#endif
    7969
    8070#endif /* !IPRT_INCLUDED_nt_wdm_h */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette