From e1dda970283bd9c9f8b6b8a6f46a1d36f88adb4d Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Thu, 15 Oct 2020 16:10:45 -0400
Subject: [PATCH] TT#14008 fix some warnings from musl

Change-Id: I99fe1185cf814232b44c078b62199e850850cb0d
---
 daemon/graphite.c  | 2 +-
 daemon/websocket.c | 4 ++--
 t/tests-preload.c  | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/daemon/graphite.c b/daemon/graphite.c
index 281784b8a..cea5ebf3b 100644
--- a/daemon/graphite.c
+++ b/daemon/graphite.c
@@ -6,7 +6,7 @@
  */
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
diff --git a/daemon/websocket.c b/daemon/websocket.c
index 89be07cd7..e27d3aecb 100644
--- a/daemon/websocket.c
+++ b/daemon/websocket.c
@@ -546,7 +546,7 @@ static int websocket_http(struct lws *wsi, enum lws_callback_reasons reason, voi
 		case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION:
 			return -1; // disallow non supported websocket protocols
 		case LWS_CALLBACK_GET_THREAD_ID:
-			return pthread_self();
+			return (long int) pthread_self();
 		case LWS_CALLBACK_WSI_CREATE:
 			ilog(LOG_DEBUG, "WS client created %p", wsi);
 			break;
@@ -609,7 +609,7 @@ static int websocket_protocol(struct lws *wsi, enum lws_callback_reasons reason,
 #endif
 			break;
 		case LWS_CALLBACK_GET_THREAD_ID:
-			return pthread_self();
+			return (long int) pthread_self();
 		case LWS_CALLBACK_ESTABLISHED:
 			ilog(LOG_DEBUG, "Websocket protocol '%s' established", name);
 			websocket_conn_init(wsi, wc);
diff --git a/t/tests-preload.c b/t/tests-preload.c
index 95eea3320..9906fc95b 100644
--- a/t/tests-preload.c
+++ b/t/tests-preload.c
@@ -12,6 +12,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <pthread.h>
+#include <string.h>
 
 typedef struct {
 	int used_domain,