merge from upstream. currently seems to have bitroted and i get segfaults

[gnu-emacs] / src / getloadavg.c

diff --git a/src/getloadavg.c b/src/getloadavg.c
index 1a907c0c7acf32f0cae6e95195dab6d06a2f9245..d9c24717b79d73309ba9036c588ea9572409f536 100644 (file)
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -355,10 +355,7 @@ extern int errno;
 #  define LDAV_SYMBOL "avenrun"
 # endif
 
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-
+# include <unistd.h>
 # include <stdio.h>
 
 /* LOAD_AVE_TYPE should only get defined if we're going to use the