From ea18d30c209cb4e3f0dd0bc5e4380345e81b6fb6 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 15 Apr 2010 07:32:25 +0200 Subject: atomic_ptr fix of Win64 --- include/zmq.h | 2 +- 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 -- cgit v1.2.3