Merge "master" into "next".

[cascardo/ovs.git] / lib / socket-util.c

diff --git a/lib/socket-util.c b/lib/socket-util.c
index d2ee8ea..a8f805c 100644 (file)
--- a/lib/socket-util.c
+++ b/lib/socket-util.c
@@ -204,7 +204,7 @@ make_sockaddr_un(const char *name, struct sockaddr_un* un, socklen_t *un_len)
  *
  * Returns the socket's fd if successful, otherwise a negative errno value. */
 int
-make_unix_socket(int style, bool nonblock, bool passcred UNUSED,
+make_unix_socket(int style, bool nonblock, bool passcred OVS_UNUSED,
                  const char *bind_path, const char *connect_path)
 {
     int error;