Skip to content

L
libzmq
Commit ea18d30c authored by Martin Sustrik's avatar Martin Sustrik
Browse files
Options

atomic_ptr fix of Win64

parent 7668e797
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/zmq.h
View file @ ea18d30c
...@@ -40,7 +40,7 @@ extern "C" { ...@@ -40,7 +40,7 @@ extern "C" {
#endif #endif
/******************************************************************************/ /******************************************************************************/
/* 0MQ versioning supprt. */ /* 0MQ versioning support. */
/******************************************************************************/ /******************************************************************************/
ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch); ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
......
src/atomic_ptr.hpp
View file @ ea18d30c
...@@ -78,7 +78,7 @@ namespace zmq ...@@ -78,7 +78,7 @@ namespace zmq
inline T *xchg (T *val_) inline T *xchg (T *val_)
{ {
#if defined ZMQ_ATOMIC_PTR_WINDOWS #if defined ZMQ_ATOMIC_PTR_WINDOWS
return (T*) InterlockedExchangePointer (&ptr, val_); return (T*) InterlockedExchangePointer ((PVOID*) &ptr, val_);
#elif defined ZMQ_ATOMIC_PTR_SYSTEM #elif defined ZMQ_ATOMIC_PTR_SYSTEM
return (T*) atomic_swap_ptr (&ptr, val_); return (T*) atomic_swap_ptr (&ptr, val_);
#elif defined ZMQ_ATOMIC_PTR_X86 #elif defined ZMQ_ATOMIC_PTR_X86
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment