diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-13 18:27:20 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-13 18:27:20 -0300 |
| commit | eab5d29810d5d330e0d98f78a9c5ce7dd48a103a (patch) | |
| tree | 2f9605f729c30b579684aa18f4bc8c259142868a | |
| parent | 657c0720361499e573688384d4f6f625ef897bf8 (diff) | |
| parent | 6a93b596c5c3af31b843d63013a7985ffeea354d (diff) | |
| download | ffmpeg-streaming-eab5d29810d5d330e0d98f78a9c5ce7dd48a103a.zip ffmpeg-streaming-eab5d29810d5d330e0d98f78a9c5ce7dd48a103a.tar.gz | |
Merge commit '6a93b596c5c3af31b843d63013a7985ffeea354d'
* commit '6a93b596c5c3af31b843d63013a7985ffeea354d':
compat/atomics: add typecasts in atomic_compare_exchange_strong()
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | compat/atomics/suncc/stdatomic.h | 2 | ||||
| -rw-r--r-- | compat/atomics/win32/stdatomic.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compat/atomics/suncc/stdatomic.h b/compat/atomics/suncc/stdatomic.h index 4a864a4..0cf89e0 100644 --- a/compat/atomics/suncc/stdatomic.h +++ b/compat/atomics/suncc/stdatomic.h @@ -108,7 +108,7 @@ static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *exp intptr_t desired) { intptr_t old = *expected; - *expected = atomic_cas_ptr(object, old, desired); + *expected = (intptr_t)atomic_cas_ptr(object, (void *)old, (void *)desired); return *expected == old; } diff --git a/compat/atomics/win32/stdatomic.h b/compat/atomics/win32/stdatomic.h index 092f453..bb8e6e7 100644 --- a/compat/atomics/win32/stdatomic.h +++ b/compat/atomics/win32/stdatomic.h @@ -105,7 +105,8 @@ static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *exp intptr_t desired) { intptr_t old = *expected; - *expected = InterlockedCompareExchangePointer(object, desired, old); + *expected = (intptr_t)InterlockedCompareExchangePointer( + (PVOID *)object, (PVOID)desired, (PVOID)old); return *expected == old; } |
