generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-30 13:47:13 +01:00
Code Issues Projects Releases Wiki Activity

atomic_ptr fix of Win64

Browse Source
This commit is contained in:
Martin Sustrik
2010-04-15 07:32:25 +02:00
parent 7668e7976d
commit ea18d30c20
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/zmq.h
View File

@@ -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);

2
src/atomic_ptr.hpp
View File

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