summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMartin Lucina <mato@kotelna.sk>2010-09-04 16:24:21 +0200
committerMartin Lucina <mato@kotelna.sk>2010-09-04 16:24:21 +0200
commitca176121deb8dbdc62d8a37fec377c07fc786480 (patch)
tree6b53af092e5de652a6ba92ba771333901930fa62 /include
parent2673a84e07b93b8607958516c55341c2eb220a6e (diff)
parent51a84c15ded2d70985c9d971ebdf3f3c9c18d590 (diff)
Merge branch 'maint'
* maint: zmq::select_t, zmq_poll(): assert if FD_SETSIZE reached zmq.h: Fix typo and use of C99 comment Conflicts: src/zmq.cpp
Diffstat (limited to 'include')
-rw-r--r--include/zmq.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/zmq.h b/include/zmq.h
index 075ff3c..26c6a1e 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -42,13 +42,13 @@ extern "C" {
#endif
/******************************************************************************/
-/* 0MQ versioning support. */
+/* 0MQ versioning support. */
/******************************************************************************/
ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
/******************************************************************************/
-// 0MQ errors.
+/* 0MQ errors. */
/******************************************************************************/
/* A number random anough not to collide with different errno ranges on */