Merge pull request #1830 from stevenc99/master

include sys/ucred.h for struct ucred

Merge pull request #1830 from stevenc99/master
include sys/ucred.h for struct ucred
708c2060 · Joe Eli McIlvain · d7691756 · dd8ccd5e · 708c2060 · 708c2060
Commit 708c2060 authored Feb 28, 2016 by Joe Eli McIlvain
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

ipc_listener.cpp src/ipc_listener.cpp +3 -1

options.hpp src/options.hpp +3 -0

No files found.
--- a/src/ipc_listener.cpp
+++ b/src/ipc_listener.cpp
@@ -50,10 +50,12 @@
 #include <fcntl.h>
 #include <sys/un.h>

-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
+#ifdef ZMQ_HAVE_LOCAL_PEERCRED
 #   include <sys/types.h>
+#   include <sys/ucred.h>
 #endif
 #ifdef ZMQ_HAVE_SO_PEERCRED
+#   include <sys/types.h>
 #   include <pwd.h>
 #   include <grp.h>
 #   if defined ZMQ_HAVE_OPENBSD

--- a/src/options.hpp
+++ b/src/options.hpp
@@ -42,6 +42,9 @@
 #if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
 #include <sys/types.h>
 #endif
+#ifdef ZMQ_HAVE_LOCAL_PEERCRED
+#include <sys/ucred.h>
+#endif

 //  Normal base 256 key is 32 bytes
 #define CURVE_KEYSIZE       32