Skip to content

L
libzmq
Commit 010f93b3 authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Merge pull request #1460 from tkoeppe/master 

atomic_ptr.h: clean up the clean-up
parents 80b1e67e 73e6a380
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 14 deletions
src/atomic_ptr.hpp
View file @ 010f93b3
...@@ -217,21 +217,13 @@ namespace zmq ...@@ -217,21 +217,13 @@ namespace zmq
} }
// Remove macros local to this file. // Remove macros local to this file.
#if defined ZMQ_ATOMIC_PTR_WINDOWS #undef ZMQ_ATOMIC_PTR_MUTEX
#undef ZMQ_ATOMIC_PTR_WINDOWS #undef ZMQ_ATOMIC_PTR_INTRINSIC
#endif #undef ZMQ_ATOMIC_CXX11
#if defined ZMQ_ATOMIC_PTR_ATOMIC_H
#undef ZMQ_ATOMIC_PTR_ATOMIC_H
#endif
#if defined ZMQ_ATOMIC_PTR_X86
#undef ZMQ_ATOMIC_PTR_X86 #undef ZMQ_ATOMIC_PTR_X86
#endif
#if defined ZMQ_ATOMIC_PTR_ARM
#undef ZMQ_ATOMIC_PTR_ARM #undef ZMQ_ATOMIC_PTR_ARM
#endif #undef ZMQ_ATOMIC_PTR_TILE
#if defined ZMQ_ATOMIC_PTR_MUTEX #undef ZMQ_ATOMIC_PTR_WINDOWS
#undef ZMQ_ATOMIC_PTR_MUTEX #undef ZMQ_ATOMIC_PTR_ATOMIC_H
#endif
#endif #endif
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