Frank
b04abfae57
cmake: use FindSodium module
2014-03-23 10:56:02 +01:00
Pieter Hintjens
4706a18cf3
Merge pull request #945 from twwlogin/patch-2
...
Allow iov_base as char * on Solaris 8/9/10.
2014-03-21 12:13:42 +02:00
Pieter Hintjens
20f22e0463
Merge pull request #944 from twwlogin/patch-1
...
Include zmq.h after platform.hpp
2014-03-21 12:13:14 +02:00
twwlogin
b7a663f1c1
Allow iov_base as char * on Solaris 8/9/10.
...
On Solaris 8, 9, 10/SPARC, iov_base is of type caddr_t which is char *. The Sun C++ compiler errors with "Cannot assign void* to char*". Using a static case to override this. On Solaris 11, HP-UX, AIX, and RHEL, iov_base is void * so no issues there. This seems a rather hackish solution so open to something better.
2014-03-21 01:32:01 -05:00
twwlogin
9051456f18
Include zmq.h after platform.hpp
...
zmq.h requires definitions from platform.hpp so include platform.hpp before zmq.h. This is only an intermediate fix though. zmq.h should not require definitions from platform.hpp because platform.hpp is not installed. So, when zmq.h wants to include <inttypes.h> on ZMQ_HAVE_SOLARIS || ZMQ_HAVE_OPENVMS, it will not and fall back to #include <stdint.h> which will fail when building something like pyzmq on Solaris 8, 9/SPARC which do not have <stdint.h>
2014-03-21 01:24:25 -05:00
Pieter Hintjens
c217ab73b1
Merge pull request #941 from veegee/master
...
Fix building on MinGW64 Windows
2014-03-20 18:30:03 +02:00
V G
89cbd3d2fa
Fix building on MinGW64 Windows
...
Mingw64 provides mstcpip.h and the build fails (redefinition) if the struct tcp_keepalive is redefined. Do not define the struct if __MINGW64__ is defined. Note that I had to manually pass the compile definition to cmake: -D__MINGW64__=1
2014-03-20 12:22:15 -04:00
Pieter Hintjens
faacb1413f
Merge pull request #938 from bebopagogo/master
...
norm_engine update with no encoder_base_t::has_data() dependency
2014-03-20 07:22:57 +02:00
Pieter Hintjens
8116fe55b7
Merge pull request #937 from snikulov/fix_dll_out_path
...
cmake // fixed msvc dll output path
2014-03-20 07:22:41 +02:00
bebopagogo
cd9755e4aa
removed norm_engine dependency on deprecated encoder_base::has_data() method
2014-03-19 15:02:06 -04:00
bebopagogo
0a97e05439
removed dependency on deprecated encoder_base::has_data() method
2014-03-19 15:00:03 -04:00
Sergei Nikulov
58a1430ca0
fixed msvc dll output path
2014-03-19 22:01:45 +04:00
Richard Newton
65dcd79047
Merge pull request #936 from soundart/master
...
cmake: fix test_fork, fix fragile code related to HAVE_FORK macro
2014-03-18 22:08:33 +00:00
Frank
8edc80f27b
cmake: fix fragile code related to HAVE_FORK macro
...
* report from Richard Newton indicated previous solutions was not
working on Windows
2014-03-18 21:07:45 +01:00
Pieter Hintjens
59b20e7f3e
Merge pull request #934 from evoskuil/master
...
Add Visual Studio 2013 solution and build for (v120) of libzmq project.
2014-03-18 08:47:53 +01:00
evoskuil
8782484fb5
Visual Studio 2013 build updates.
2014-03-17 23:57:48 -07:00
Pieter Hintjens
a57cf1958a
Merge pull request #933 from soundart/master
...
cmake: fix test_fork
2014-03-17 21:26:40 +01:00
Frank
9dc890c501
fix test_fork
...
* was problem on debian/wheezy
2014-03-17 21:21:06 +01:00
Ian Barber
65c0ed4727
Merge pull request #932 from ricnewton/master
...
Remove delays in test_connect_rid and destroy/recreate context between tests
2014-03-17 14:41:14 +00:00
Richard Newton
b31ea51ca0
Merge pull request #931 from Dahko/patch-1
...
Fixed wrong assert in zmq_recv
2014-03-17 13:48:32 +00:00
Richard Newton
f5eebc2ae3
Remove delays and destroy/recreate context between tests
2014-03-17 13:41:02 +00:00
Dahko
6a627acea7
Fixed wrong assert in zmq_recv
...
zmq_recv returns bytes count, not error code, so 'assert (rc==0)' behaved completely wrong
2014-03-17 16:38:19 +03:00
Ian Barber
5ced51b753
Merge pull request #930 from ricnewton/master
...
Add delays in test_connect_rid
2014-03-17 13:23:04 +00:00
Richard Newton
e27a610897
Fix tabs
2014-03-17 12:32:21 +00:00
Richard Newton
26dc643205
Add delays in test_connect_rid to allow time for socket to close before address reuse.
2014-03-17 12:24:52 +00:00
evoskuil
18e885bbe4
Add vs2013 solution and build for (v120) of libzmq project.
2014-03-17 01:49:57 -07:00
Pieter Hintjens
be6763e381
Merge pull request #928 from bebopagogo/master
...
fixed another missed norm_engine issue for non-norm build
2014-03-16 17:40:33 +01:00
Pieter Hintjens
e9523a98b5
Merge pull request #927 from ricnewton/master
...
Fix cmake build on windows & travis build.
2014-03-16 17:40:21 +01:00
bebopagogo
43071bc724
fixed another missed norm_engine issue for non-norm build
2014-03-16 12:31:19 -04:00
Richard Newton
5bd5188ec6
Fix tabs
2014-03-16 16:18:30 +00:00
Richard Newton
7cead2bfd6
Fix travis build.
2014-03-16 16:15:19 +00:00
Richard Newton
a4b0e93fc1
Fix travis build.
2014-03-16 16:01:47 +00:00
Richard Newton
05229ea673
Fix cmake build on windows.
2014-03-16 15:59:50 +00:00
Richard Newton
0e0c46aedc
Merge pull request #926 from bebopagogo/master
...
added uncommitted norm_engine changes
2014-03-16 15:55:47 +00:00
bebopagogo
d3e0be1528
added uncommitted norm_engine changes
2014-03-16 09:15:31 -04:00
Ian Barber
0514aa5b51
Merge pull request #925 from hintjens/master
...
Fixed comment
2014-03-16 11:07:20 +00:00
Pieter Hintjens
b433adf49e
Fixed comment
2014-03-16 11:53:40 +01:00
Pieter Hintjens
74d344ca74
Merge pull request #924 from bebopagogo/master
...
NORM protocol extension
2014-03-16 09:33:59 +01:00
bebopagogo
33f22d0d04
added norm_engine
2014-03-15 10:48:12 -04:00
bebopagogo
c91a638a5a
added norm_engine
2014-03-15 10:46:21 -04:00
Ian Barber
72c02b1569
Merge pull request #923 from hintjens/master
...
Revert "Fixed potential SEGFAULT."
2014-03-14 15:06:04 +00:00
Pieter Hintjens
b1e74f79c4
Revert "Fixed potential SEGFAULT."
...
This reverts commit 79b81f4840
.
Was causing:
Assertion failed: destroyed (socket_base.cpp:154)
/bin/bash: line 5: 31344 Aborted ${dir}$tst
FAIL: test_many_sockets
On TravisCI.
2014-03-14 09:39:56 +01:00
Pieter Hintjens
a5e397a55e
Merge pull request #922 from horus42/master
...
Fixed potential SEGFAULT in socket_base.cpp
2014-03-13 12:46:09 +01:00
czach
03a3dd2503
Merge remote-tracking branch 'upstream/master'
2014-03-13 11:11:17 +01:00
czach
79b81f4840
Fixed potential SEGFAULT.
2014-03-13 11:05:50 +01:00
Pieter Hintjens
49e035fb40
Merge pull request #921 from mbarbisan/master
...
Allow TCP addresses to be re-resolved whenever there is a reconnection a...
2014-03-12 18:36:13 +01:00
Mark Barbisan
350a1ac12b
Allow TCP addresses to be re-resolved whenever there is a reconnection attempt
2014-03-12 13:28:37 -04:00
Pieter Hintjens
4e5f866fa4
Merge pull request #920 from mbarbisan/master
...
Add the tag name to the zmq_pollitem_t struct to allow easier forward de...
2014-03-12 15:28:31 +01:00
Mark Barbisan
52db50f844
Add the tag name to the zmq_pollitem_t struct to allow easier forward declaration
2014-03-12 10:11:12 -04:00
Pieter Hintjens
e224be25dc
Merge pull request #914 from drewcrawford/issue_912
...
Libsodium is now required if and only if --with-libsodium is used
2014-03-10 21:06:06 +01:00