atomic_ptr fix of Win64

ea18d30c · Martin Sustrik · 7668e797 · ea18d30c · ea18d30c
Commit ea18d30c authored Apr 15, 2010 by Martin Sustrik
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

zmq.h include/zmq.h +1 -1

atomic_ptr.hpp src/atomic_ptr.hpp +1 -1

No files found.
--- 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);

--- 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