diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-04-15 07:32:25 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-04-15 07:32:25 +0200 |
| commit | ea18d30c209cb4e3f0dd0bc5e4380345e81b6fb6 (patch) | |
| tree | bae5046dec61c30bdf8ac9d63fb9f5761747d892 | |
| parent | 7668e7976dc6c3e18a314d991381f29f5cbcc6ef (diff) | |
atomic_ptr fix of Win64
| -rw-r--r-- | include/zmq.h | 2 | ||||
| -rw-r--r-- | src/atomic_ptr.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/zmq.h b/include/zmq.h index fc52584..47d8359 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -40,7 +40,7 @@ extern "C" { #endif /******************************************************************************/ -/* 0MQ versioning supprt. */ +/* 0MQ versioning support. */ /******************************************************************************/ ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch); diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp index e4a7491..9f2e759 100644 --- a/src/atomic_ptr.hpp +++ b/src/atomic_ptr.hpp @@ -78,7 +78,7 @@ namespace zmq inline T *xchg (T *val_) { #if defined ZMQ_ATOMIC_PTR_WINDOWS - return (T*) InterlockedExchangePointer (&ptr, val_); + return (T*) InterlockedExchangePointer ((PVOID*) &ptr, val_); #elif defined ZMQ_ATOMIC_PTR_SYSTEM return (T*) atomic_swap_ptr (&ptr, val_); #elif defined ZMQ_ATOMIC_PTR_X86 |