mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-13 10:52:56 +01:00
Merge branch 'zeromq/master'
Conflicts: builds/msvc/vs2010/inproc_lat/inproc_lat.props builds/msvc/vs2010/inproc_thr/inproc_thr.props builds/msvc/vs2010/libsodium.import.props builds/msvc/vs2010/libzmq.import.props builds/msvc/vs2010/libzmq/libzmq.props builds/msvc/vs2010/local_lat/local_lat.props builds/msvc/vs2010/local_thr/local_thr.props builds/msvc/vs2010/properties/Common.props builds/msvc/vs2010/properties/Console.props builds/msvc/vs2010/properties/ConsoleDebugDynamic.props builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/ConsoleDebugStatic.props builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/ConsoleReleaseStatic.props builds/msvc/vs2010/properties/Debug.props builds/msvc/vs2010/properties/Dynamic.props builds/msvc/vs2010/properties/DynamicDebug.props builds/msvc/vs2010/properties/DynamicRelease.props builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props builds/msvc/vs2010/properties/Release.props builds/msvc/vs2010/properties/Static.props builds/msvc/vs2010/properties/StaticDebug.props builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/StaticRelease.props builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props builds/msvc/vs2010/properties/Win32.props builds/msvc/vs2010/properties/x64.props builds/msvc/vs2010/remote_lat/remote_lat.props builds/msvc/vs2010/remote_thr/remote_thr.props
This commit is contained in:
evoskuil
commit
5a76db6f27
@ -40,7 +40,7 @@ if(POLLER STREQUAL "")
|
||||
if(HAVE_POLL)
|
||||
set(POLLER "poll")
|
||||
else()
|
||||
if(CMAKE_HOST_WIN32)
|
||||
if(WIN32)
|
||||
set(CMAKE_REQUIRED_INCLUDES winsock2.h)
|
||||
set(HAVE_SELECT 1)
|
||||
else()
|
||||
@ -418,7 +418,7 @@ if(MINGW)
|
||||
set(CMAKE_RC_COMPILER_INIT windres)
|
||||
enable_language(RC)
|
||||
set(CMAKE_RC_COMPILE_OBJECT
|
||||
"<CMAKE_RC_COMPILER> <FLAGS> --target=${rc_target} <DEFINES> -i <SOURCE> -o <OBJECT>")
|
||||
"<CMAKE_RC_COMPILER> <FLAGS> -O coff --target=${rc_target} <DEFINES> -i <SOURCE> -o <OBJECT>")
|
||||
endmacro()
|
||||
|
||||
if (NOT CMAKE_SYSTEM_PROCESSOR )
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\..\src\address.cpp">
|
||||
<Filter>src</Filter>
|
||||
|
||||
@ -403,12 +403,6 @@ ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);
|
||||
ZMQ_EXPORT int zmq_proxy (void *frontend, void *backend, void *capture);
|
||||
ZMQ_EXPORT int zmq_proxy_steerable (void *frontend, void *backend, void *capture, void *control);
|
||||
|
||||
/* Encode a binary key as printable text using ZMQ RFC 32 */
|
||||
ZMQ_EXPORT char *zmq_z85_encode (char *dest, uint8_t *data, size_t size);
|
||||
|
||||
/* Encode a binary key from printable text per ZMQ RFC 32 */
|
||||
ZMQ_EXPORT uint8_t *zmq_z85_decode (uint8_t *dest, char *string);
|
||||
|
||||
/* Deprecated aliases */
|
||||
#define ZMQ_STREAMER 1
|
||||
#define ZMQ_FORWARDER 2
|
||||
|
||||
@ -50,7 +50,8 @@
|
||||
#endif
|
||||
|
||||
// Workaround missing Mstcpip.h in mingw32 (MinGW64 provides this)
|
||||
#if defined __MINGW32__ && !defined SIO_KEEPALIVE_VALS && !defined __MINGW64__
|
||||
// __MINGW64_VERSION_MAJOR is only defined when using in mingw-w64
|
||||
#if defined __MINGW32__ && !defined SIO_KEEPALIVE_VALS && !defined __MINGW64_VERSION_MAJOR
|
||||
struct tcp_keepalive {
|
||||
u_long onoff;
|
||||
u_long keepalivetime;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INCLUDES = -I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/include
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
LDADD = $(top_builddir)/src/libzmq.la
|
||||
|
||||
@ -19,7 +19,6 @@ noinst_PROGRAMS = test_system \
|
||||
test_term_endpoint \
|
||||
test_srcfd \
|
||||
test_monitor \
|
||||
test_resource \
|
||||
test_router_mandatory \
|
||||
test_router_handover \
|
||||
test_probe_router \
|
||||
@ -86,7 +85,6 @@ test_last_endpoint_SOURCES = test_last_endpoint.cpp
|
||||
test_term_endpoint_SOURCES = test_term_endpoint.cpp
|
||||
test_srcfd_SOURCES = test_srcfd.cpp
|
||||
test_monitor_SOURCES = test_monitor.cpp
|
||||
test_resource_SOURCES = test_resource.cpp
|
||||
test_router_mandatory_SOURCES = test_router_mandatory.cpp
|
||||
test_router_handover_SOURCES = test_router_handover.cpp
|
||||
test_probe_router_SOURCES = test_probe_router.cpp
|
||||
@ -137,7 +135,7 @@ endif
|
||||
|
||||
# Run the test cases
|
||||
TESTS = $(noinst_PROGRAMS)
|
||||
XFAIL_TESTS = test_resource
|
||||
XFAIL_TESTS =
|
||||
|
||||
if !ON_LINUX
|
||||
XFAIL_TESTS += test_abstract_ipc
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
/*
|
||||
Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
|
||||
|
||||
This file is part of 0MQ.
|
||||
|
||||
0MQ is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
0MQ is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "testutil.hpp"
|
||||
|
||||
int main (int argc, char *argv [])
|
||||
{
|
||||
const char *bind_1 = "tcp://127.0.0.1:5555/resource/1";
|
||||
const char *bind_2 = "tcp://127.0.0.1:5555/resource/2";
|
||||
|
||||
int rc;
|
||||
|
||||
void* ctx = zmq_init (1);
|
||||
assert (ctx);
|
||||
|
||||
void* p1 = zmq_socket (ctx, ZMQ_PUSH);
|
||||
assert (p1);
|
||||
|
||||
rc = zmq_bind(p1, bind_1);
|
||||
assert (rc == 0);
|
||||
|
||||
void* p2 = zmq_socket (ctx, ZMQ_PUSH);
|
||||
assert (p2);
|
||||
|
||||
// should be able to bind a second socket to the same ip/port
|
||||
// but with different resource
|
||||
rc = zmq_bind(p2, bind_2);
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_close (p1);
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_close (p2);
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_term (ctx);
|
||||
assert (rc == 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user