From 9ff64c8d7c43cc7c819e0fdce4476b606e1cb28b Mon Sep 17 00:00:00 2001
From: Dan Robertson <danlrobertson89@gmail.com>
Date: Wed, 7 Feb 2018 03:22:22 +0000
Subject: [PATCH] musl: compile with musl libc

Ensure that wsutil/ws_pipe.c includes <sys/select.h> as as both
the timeval struct and the select function are used.

Change-Id: Idbd9e9a5b9cbee9977a423c32e55be81bb6425c3
Reviewed-on: https://code.wireshark.org/review/25616
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
---
 ConfigureChecks.cmake | 1 +
 configure.ac          | 2 +-
 wsutil/ws_pipe.c      | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 4e2f0a01d0..46677aea09 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -41,6 +41,7 @@ check_include_file("portaudio.h"         HAVE_PORTAUDIO_H)
 check_include_file("pwd.h"               HAVE_PWD_H)
 check_include_file("sys/ioctl.h"         HAVE_SYS_IOCTL_H)
 check_include_file("sys/param.h"         HAVE_SYS_PARAM_H)
+check_include_file("sys/select.h"        HAVE_SYS_SELECT_H)
 check_include_file("sys/socket.h"        HAVE_SYS_SOCKET_H)
 check_include_file("sys/sockio.h"        HAVE_SYS_SOCKIO_H)
 check_include_file("sys/stat.h"          HAVE_SYS_STAT_H)
diff --git a/configure.ac b/configure.ac
index c7bcc4b2e2..129f3cb99e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2111,7 +2111,7 @@ dnl	   environment such as Cygwin (although Wireshark should be built
 dnl	   natively rather than using Cygwin).
 dnl
 AC_CHECK_HEADERS(fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h unistd.h)
-AC_CHECK_HEADERS(sys/ioctl.h sys/param.h sys/socket.h sys/sockio.h sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h)
+AC_CHECK_HEADERS(sys/ioctl.h sys/param.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h)
 AC_CHECK_HEADERS(netinet/in.h)
 AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h)
 AC_CHECK_HEADERS(ifaddrs.h)
diff --git a/wsutil/ws_pipe.c b/wsutil/ws_pipe.c
index 8f21014503..2c0f28b89e 100644
--- a/wsutil/ws_pipe.c
+++ b/wsutil/ws_pipe.c
@@ -20,6 +20,9 @@
 #include <io.h>
 #else
 #include <unistd.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 #endif
 
 #include <glib.h>