Commit Graph

3960 Commits

Author SHA1 Message Date
Peter Korsgaard
e89577d30c libzmq: Fix pkg-config files for static linking
Libzmq uses C++ standard library features, so users of it should link
against that as well when statically linking.

Add it to Libs.private so users using pkg-config automatically gets the
correct linker flags.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-13 08:01:34 +02:00
Pieter Hintjens
4c36c93a31 Merge pull request #1397 from danriegsecker/master
Some test fail to build targeting less that Windows Vista
2015-05-07 22:56:40 +02:00
Dan Riegsecker
f4f918ba73 Some test fail to build targeting less that Windows Vista
When targeting a version of Windows less than Windows Vista, the
security tests fail to build. Added a check for Windows version
and substituted inet_pton for inet_addr. Fixes libzmq issue #1396.
2015-05-07 16:52:37 -04:00
Constantin Rack
59add707cd Merge pull request #1395 from anton-sergeev/master
Add CMake option for perf-tools
2015-05-06 18:23:57 +02:00
Anton Sergeev
5f9b258295 Make CMake option for perf-tools
This allow disable making perf-tools in Release build type

Signed-off-by: Anton Sergeev <Anton.Sergeev@elecard.ru>
2015-05-06 21:25:26 +06:00
Pieter Hintjens
3699242c4e Merge pull request #1394 from BurningEnlightenment/master
REPLACE CMAKE MSVC VERSION SUFFIX VARIABLE
2015-05-05 22:05:55 +02:00
Henrik S. Gaßmann
f0a76318f4 REPLACE MSVC VERSION SUFFIX VARIABLE
Replace _zmq_COMPILER with CMAKE_VS_PLATFORM_TOOLSET; so the suffix can
be automagically generated for every MSVC compiler supported by cmake.
2015-05-05 21:39:50 +02:00
Pieter Hintjens
959ab527f4 Merge pull request #1391 from CommanderBubble/master
FD_SETSIZE Increase to 1024
2015-05-01 18:21:11 +02:00
Michael
1bfff06b8d Merge pull request #3 from CommanderBubble/FD-SETSIZE-update
FD_SETSIZE Increase to 1024
2015-05-02 01:17:56 +10:00
Michael
166a14c4a5 Update configure.ac 2015-05-02 01:13:33 +10:00
Michael
bd795d6f7a Update configure.ac 2015-05-02 01:12:22 +10:00
Michael
095741cd9c set FD_SETSIZE to 1024 on mingw
Sets FD_SETSIZE to 1024 under mingw systems, increasing it from the default of 64, and brings it into line with the previous limit for CMake builds on mingw.
2015-05-02 01:11:54 +10:00
Michael
235a1dbf7d Merge pull request #2 from zeromq/master
update to current master
2015-05-02 00:54:49 +10:00
Richard Newton
43a1192ca4 Merge pull request #1390 from hintjens/master
Problem: incomplete specs for test_proxy_terminate
2015-05-01 10:52:05 +01:00
Pieter Hintjens
74888769d6 Problem: incomplete specs for test_proxy_terminate
Solution: fixed this in Makefile.am
2015-05-01 11:31:45 +02:00
Pieter Hintjens
eead3bc661 Merge pull request #1388 from rikvdh/issue-1382
Fix for issue #1382
2015-05-01 11:18:56 +02:00
Rik van der Heijden
7b9e9b838d Issue #1382: Do not send data to backend when there are no listeners (+ tests) 2015-05-01 10:39:29 +02:00
Pieter Hintjens
e1e9fb3629 Merge pull request #1387 from c-rack/1386-libsodium-checkout
Solution: Build libsodium from latest master branch. Fixes 1386.
2015-04-28 14:02:54 +03:00
Constantin Rack
7e8ba0ecff Solution: Build libsodium from latest master branch. Fixes 1386. 2015-04-28 10:42:56 +02:00
Constantin Rack
3ec0e770b5 Merge pull request #1384 from hurtonm/master
Release memory on connection termination for pub, push sockets
2015-04-28 08:22:47 +02:00
Martin Hurton
2e06737bf4 pub: Don't delay pipe termination 2015-04-28 07:48:54 +02:00
Martin Hurton
09a65c5598 push: Don't delay pipe termination 2015-04-28 07:48:04 +02:00
Richard Newton
aabbe3f33a Merge pull request #1383 from somdoron/master
change minimum version to windows vista
2015-04-27 13:33:55 +01:00
somdoron
c2dcc80602 change minimum version to windows vista and implement dummy condition variable for lower versions 2015-04-26 09:16:01 +03:00
Pieter Hintjens
dbacc34238 Merge pull request #1379 from evoskuil/master
Problem: integer narrowing issues.
2015-04-22 08:45:19 +03:00
evoskuil
30bd7c481e Fix integer narrowing issues. 2015-04-21 22:26:32 -07:00
Constantin Rack
cd830dd203 Merge pull request #1378 from CommanderBubble/master
Allow configure to support mingw64
2015-04-21 14:15:14 +02:00
Michael
a53404f2f9 Merge pull request #1 from CommanderBubble/CommanderBubble-configure.ac-adds_mingw64_support
allow host_os to accept mingw64
2015-04-21 22:03:59 +10:00
Richard Newton
88ac63189c Merge pull request #1341 from hintjens/master
Problem: issue #1144, 1377
2015-04-20 12:28:54 +01:00
Pieter Hintjens
594e3dcceb Problem: shutdown asserts if WSASTARUP wasn't done previously
This is a silly assertion that causes problems if libzmq.dll is
called in some esoteric ways.

Solution: if the shutdown code detects WSANOTINITIALISED, then
exit silently.

Fixes #1377
Fixes #1144
2015-04-20 12:53:37 +02:00
Pieter Hintjens
0673cd4e69 Problem: test_disconnect_inproc sometimes fails
Solution: add settle pause after zmq_connect

Fixes #1340
2015-04-20 12:53:37 +02:00
Constantin Rack
9a4c4da265 Merge pull request #1375 from natano/configure_bitrig
Add Bitrig to OS detection in configure.ac.
2015-04-18 08:48:50 +02:00
Martin Natano
8957ad5edf Add Bitrig to OS detection in configure.ac. 2015-04-17 22:14:53 +02:00
Richard Newton
f9fe77f421 Merge branch 'master' of https://github.com/zeromq/libzmq 2015-04-16 15:00:32 +01:00
Michael
c9bdcfc584 allow host_os to accept mingw64
Changes the pattern for the host_os matches to *mingw* from *mingw32* to accept both mingw32 and mingw64 versions.
2015-04-16 00:40:32 +10:00
Constantin Rack
04a9d582fd Merge pull request #1374 from kreuzberger/master
Fix for issue #1287: ZMQ_XPUB_NODROP documentation
2015-04-14 18:36:45 +02:00
Jörg Kreuzberger
d4a5803495 Update zmq_setsockopt.txt
#1287
2015-04-14 18:32:06 +02:00
Jörg Kreuzberger
18b6e6803b Add documenation for ZMQ_XPUP_NODROP
fix for issue #1287
2015-04-14 18:30:27 +02:00
Richard Newton
a756eee30b Merge branch 'master' of https://github.com/zeromq/libzmq 2015-04-14 10:36:54 +01:00
Constantin Rack
6b4d9bca0c Merge pull request #1370 from calid/unbind-enoent
doc: add ENOENT to list of zmq_unbind error codes
2015-03-15 14:14:20 +01:00
Dylan Cali
edc0640206 doc: add ENOENT to list of zmq_unbind error codes
Resolves zeromq/libzmq#1353
2015-03-15 08:07:13 -05:00
Constantin Rack
2d435eb692 Merge pull request #1369 from calid/ctx-term-vs-destroy
update zmq_ctx_term description for consistency
2015-03-15 12:53:26 +01:00
Dylan Cali
023505aced update zmq_ctx_term description for consistency
zmq_term and zmq_ctx_destroy are just aliases for zmq_ctx_term. that
being the case use 'terminate' in the description for all three so there
isn't any confusion about behavior.

also update the deprecates list in zmq_ctx_term to include
zmq_ctx_destroy.
2015-03-15 06:29:21 -05:00
Pieter Hintjens
4820d493b0 Merge pull request #1368 from calid/docfix-zmq-msg-init
doc: zmq_msg_init does not set errno
2015-03-15 09:51:40 +01:00
Dylan Cali
4c92fefe1b doc: zmq_msg_init does not set errno
In fact it always returns zero.
2015-03-15 02:12:02 -05:00
Constantin Rack
eb34533728 Merge pull request #1367 from evoskuil/master
Problem: wrong default VC rt lib for release dynamic exe.
2015-03-14 13:18:06 +01:00
evoskuil
1e27b364a4 Fix default VC rt lib for release dynamic exe. 2015-03-14 05:10:40 -07:00
Constantin Rack
6b06bc310f Merge pull request #1366 from xantares/patch-1
fix CMP0053 warning with cmake 3.1
2015-03-11 10:46:06 +01:00
xantares
032c5eda3d fix CMP0053 warning with cmake 3.1 2015-03-11 10:35:59 +01:00
Constantin Rack
ec4200a9d3 Merge pull request #1365 from xantares/master
fix cmake build system
2015-03-11 10:25:45 +01:00