From 2000d44109e1adfb3c6a2f9f947b061ba3267431 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Wed, 15 Feb 2012 09:26:39 -0600 Subject: [PATCH 1/2] Fixed syntax error in zmq_getsockopt man page --- doc/zmq_getsockopt.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt index 0d5e8a23..a9d95716 100644 --- a/doc/zmq_getsockopt.txt +++ b/doc/zmq_getsockopt.txt @@ -296,7 +296,7 @@ Applicable socket types:: all, when using multicast transports ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the timeout for recv operation on the socket. If the value is `0`, _zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no @@ -312,7 +312,7 @@ Applicable socket types:: all ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Retrieve the timeout for send operation on the socket. If the value is `0`, _zmq_send(3)_ will return immediately, with a EAGAIN error if the message @@ -392,7 +392,7 @@ Default value:: N/A Applicable socket types:: all ZMQ_LAST_ENDPOINT: Retrieve the last endpoint set -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The 'ZMQ_LAST_ENDPOINT' option shall retrieve the last endpoint bound for TCP and IPC transports. The returned value will be a string in the form of a ZMQ DSN. From bd4f703264ed71f9ad2b0043c4e4c055adbeced1 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Wed, 15 Feb 2012 09:27:42 -0600 Subject: [PATCH 2/2] Ignored generated files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 5ae4c216..5d129b12 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ tests/test_reqrep_drop tests/test_sub_forward tests/test_invalid_rep tests/test_msg_flags +tests/test_ts_context src/platform.hpp* src/stamp-h1 perf/local_lat @@ -55,6 +56,7 @@ builds/msvc/*.suo builds/msvc/*/*.user builds/msvc/*/Debug builds/msvc/*/Release +builds/redhat/zeromq.spec foreign/openpgm/* !foreign/openpgm/*.tar.bz2 !foreign/openpgm/*.tar.gz