generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-07-05 18:01:41 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1543 from csiro-workspace/master

Browse Source 
Set signaler_port to 0 which allows the OS to find a free port
This commit is contained in:
Constantin Rack 2015-08-21 08:12:09 +02:00
commit 4e5843b8ff
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -326,7 +326,9 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# default to Release build # default to Release build
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
# CMAKE_BUILD_TYPE is not used for multi-configuration generators like Visual Studio/XCode
# which instead use CMAKE_CONFIGURATION_TYPES
set(CMAKE_BUILD_TYPE Release CACHE STRING set(CMAKE_BUILD_TYPE Release CACHE STRING
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
FORCE) FORCE)
@ -436,7 +438,8 @@ set(cxx-sources
xsub.cpp xsub.cpp
zmq.cpp zmq.cpp
zmq_utils.cpp zmq_utils.cpp
decoder_allocators.cpp) decoder_allocators.cpp
config.hpp)
set(rc-sources version.rc) set(rc-sources version.rc)

6
src/config.hpp
View File

@ -89,7 +89,11 @@ namespace zmq
// On some OSes the signaler has to be emulated using a TCP // On some OSes the signaler has to be emulated using a TCP
// connection. In such cases following port is used. // connection. In such cases following port is used.
signaler_port = 5905 // If 0, it lets the OS choose a free port without requiring use of a
// global mutex. The original implementation of a Windows signaler
// socket used port 5905 instead of letting the OS choose a free port.
// https://github.com/zeromq/libzmq/issues/1542
signaler_port = 0
}; };
} }