From a7d744d55d902de56f1c5e884602b883150ac21e Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@smile.fr>
Date: Tue, 7 Apr 2020 20:58:37 +0200
Subject: [PATCH 1/2] use <poll.h> instead of <sys/poll.h>

The manpage of poll(2) states that the prototype of poll is defined
in <poll.h>. Use that header file instead of <sys/poll.h> to allow
compilation against musl-libc.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
(cherry picked from v1.4 branch commit 4cad505fc98240eb66eaabfae61a9694f8158dda)
---
 hal/ethernet/linux/ethernet_linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hal/ethernet/linux/ethernet_linux.c b/hal/ethernet/linux/ethernet_linux.c
index c3ab2e20..9aa5c28d 100644
--- a/hal/ethernet/linux/ethernet_linux.c
+++ b/hal/ethernet/linux/ethernet_linux.c
@@ -23,7 +23,7 @@
 
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>

From 801d43e118ebe029008cc58d6f4c22e85b77b25b Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@smile.fr>
Date: Tue, 7 Apr 2020 21:02:54 +0200
Subject: [PATCH 2/2] serial_port_linux: Add missing include sys/time.h

POSIX says `struct timeval` is defined if <sys/time.h> is included.

Adding this header allow to build against musl-libc.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
(cherry picked from v1.4 branch commit 661405eb6066b67dfe51d5ff9635e29f86bdd238)
---
 hal/serial/linux/serial_port_linux.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hal/serial/linux/serial_port_linux.c b/hal/serial/linux/serial_port_linux.c
index e6308c05..15e57940 100644
--- a/hal/serial/linux/serial_port_linux.c
+++ b/hal/serial/linux/serial_port_linux.c
@@ -29,6 +29,7 @@
 #include <termios.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/time.h>
 
 #include "hal_serial.h"
 #include "hal_time.h"