diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-15 10:43:50 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-15 10:43:50 -0400 |
| commit | ed17516b31404dd42eab61c599c84933af485b34 (patch) | |
| tree | 52538b48c172c7258117b1edcee4359dcf6c45e5 /Utilities/cmlibuv/src/win/atomicops-inl.h | |
| parent | 52fbae0a59d05f2724e77aff75c7761b685bae03 (diff) | |
| parent | 12a78bc824655524d817508d6107ef4dcf8e3626 (diff) | |
| download | cmake-ed17516b31404dd42eab61c599c84933af485b34.tar.gz | |
Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
libuv 2017-05-09 (e11dcd43)
Fixes: #16878
Diffstat (limited to 'Utilities/cmlibuv/src/win/atomicops-inl.h')
| -rw-r--r-- | Utilities/cmlibuv/src/win/atomicops-inl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/cmlibuv/src/win/atomicops-inl.h b/Utilities/cmlibuv/src/win/atomicops-inl.h index 61e006026c..6d8126f692 100644 --- a/Utilities/cmlibuv/src/win/atomicops-inl.h +++ b/Utilities/cmlibuv/src/win/atomicops-inl.h @@ -23,6 +23,7 @@ #define UV_WIN_ATOMICOPS_INL_H_ #include "uv.h" +#include "internal.h" /* Atomic set operation on char */ @@ -34,7 +35,7 @@ /* target to be aligned. */ #pragma intrinsic(_InterlockedOr8) -static char __declspec(inline) uv__atomic_exchange_set(char volatile* target) { +static char INLINE uv__atomic_exchange_set(char volatile* target) { return _InterlockedOr8(target, 1); } |