Port: Add OSX clock_gettime compat

[lttng-tools.git] / src / common / sessiond-comm / inet6.c

diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c
index 9eab3fa2fe7e15bc0c5d6d1417bc7f96d2150cbf..1413c35172a32bfda2293bbe8aae6fd8acba6c1a 100644 (file)
--- a/src/common/sessiond-comm/inet6.c
+++ b/src/common/sessiond-comm/inet6.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <limits.h>
@@ -27,7 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <time.h>
+#include <common/compat/time.h>
 #include <poll.h>
 
 #include <common/common.h>
@@ -102,7 +101,7 @@ int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock)
 {
        int ret;
 
-       ret = bind(sock->fd, &sock->sockaddr.addr.sin6,
+       ret = bind(sock->fd, (const struct sockaddr *) &sock->sockaddr.addr.sin6,
                        sizeof(sock->sockaddr.addr.sin6));
        if (ret < 0) {
                PERROR("bind inet6");
@@ -158,7 +157,7 @@ int connect_with_timeout(struct lttcomm_sock *sock)
                return -1;
        }
 
-       ret = clock_gettime(CLOCK_MONOTONIC, &orig_time);
+       ret = lttng_clock_gettime(CLOCK_MONOTONIC, &orig_time);
        if (ret == -1) {
                PERROR("clock_gettime");
                return -1;
@@ -212,7 +211,7 @@ int connect_with_timeout(struct lttcomm_sock *sock)
                        }
                }
                /* ret == 0: timeout */
-               ret = clock_gettime(CLOCK_MONOTONIC, &cur_time);
+               ret = lttng_clock_gettime(CLOCK_MONOTONIC, &cur_time);
                if (ret == -1) {
                        PERROR("clock_gettime");
                        connect_ret = ret;
@@ -387,7 +386,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
  * Return the size of sent data.
  */
 LTTNG_HIDDEN
-ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
+ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, const void *buf,
                size_t len, int flags)
 {
        struct msghdr msg;
@@ -396,7 +395,7 @@ ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
 
        memset(&msg, 0, sizeof(msg));
 
-       iov[0].iov_base = buf;
+       iov[0].iov_base = (void *) buf;
        iov[0].iov_len = len;
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;