Merge pull request #1119 from mosconi/master

Fix to build on OpenBSD

src/ipc_listener.cpp

@@ -45,6 +45,9 @@
 #ifdef ZMQ_HAVE_SO_PEERCRED
 #   include <pwd.h>
 #   include <grp.h>
+#   if defined ZMQ_HAVE_OPENBSD
+#       define ucred sockpeercred
+#   endif
 #endif
 
 zmq::ipc_listener_t::ipc_listener_t (io_thread_t *io_thread_,

src/stream_engine.cpp

@@ -28,6 +28,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <fcntl.h>
+#if defined ZMQ_HAVE_OPENBSD
+#define ucred sockpeercred
+#endif
 #endif
 
 #include <string.h>

tweetnacl/src/tweetnacl.c

@@ -9,11 +9,13 @@
 #define FOR(i,n) for (i = 0;i < n;++i)
 #define sv static void
 
+#ifndef TWEETNACL_BASE_H
 typedef unsigned char u8;
 typedef unsigned long u32;
 typedef unsigned long long u64;
 typedef long long i64;
 typedef i64 gf[16];
+#endif
 extern void randombytes(u8 *,u64);
 
 static const u8