changeset 39406:92552e95e19a

getloadavg: Allow building on Windows without Cygwin * lib/getloadavg.c: Reinstate ifdef for HAVE_UNISTD_H. * m4/getloadavg.m4: Check for unistd.h.
author Paul Smith <psmith@gnu.org>
date Sun, 17 Jun 2018 11:22:18 -0700
parents 32569f5cd87f
children dc8498340591
files ChangeLog lib/getloadavg.c m4/getloadavg.m4
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jun 03 18:02:10 2018 -0700
+++ b/ChangeLog	Sun Jun 17 11:22:18 2018 -0700
@@ -1,3 +1,9 @@
+2018-06-17  Paul Smith  <psmith@gnu.org>
+
+	getloadavg: Allow building on Windows without Cygwin
+	* lib/getloadavg.c: Reinstate ifdef for HAVE_UNISTD_H.
+	* m4/getloadavg.m4: Check for unistd.h.
+
 2018-06-03  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port crypto/af_alg to GCC 4.8.4
--- a/lib/getloadavg.c	Sun Jun 03 18:02:10 2018 -0700
+++ b/lib/getloadavg.c	Sun Jun 17 11:22:18 2018 -0700
@@ -324,7 +324,9 @@
 #  define LDAV_SYMBOL "avenrun"
 # endif
 
-# include <unistd.h>
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 
 /* LOAD_AVE_TYPE should only get defined if we're going to use the
    nlist method.  */
--- a/m4/getloadavg.m4	Sun Jun 03 18:02:10 2018 -0700
+++ b/m4/getloadavg.m4	Sun Jun 17 11:22:18 2018 -0700
@@ -108,7 +108,7 @@
 [
 # Figure out what our getloadavg.c needs.
 
-AC_CHECK_HEADERS_ONCE([sys/param.h])
+AC_CHECK_HEADERS_ONCE([sys/param.h unistd.h])
 
 # On HPUX9, an unprivileged user can get load averages this way.
 if test $gl_func_getloadavg_done = no; then