Assume HAVE_UNISTD_H, i.e., that <unistd.h> works.

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index d70e1c90f8dc393327200f7f90d884c89aa78951..66c58105560b5bd417835228692f79b3f15854a6 100644 (file)
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,4 +1,4 @@
-#serial 20
+#serial 21
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
@@ -12,9 +12,7 @@ AC_DEFUN([gl_CHECK_DECLS],
 #include <string.h>
 #include <stdlib.h>
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <sys/types.h>
 #if TIME_WITH_SYS_TIME

diff --git a/m4/chown.m4 b/m4/chown.m4
index 39f6bb6a3c7b34f883370f516a4bd932aba44312..389f0f97e705db80de773a0013a30bae7eaf18b8 100644 (file)
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,4 +1,4 @@
-#serial 14
+#serial 15
 # Determine whether we need the chown wrapper.
 
 dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free
@@ -44,9 +44,7 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
     gl_cv_func_chown_follows_symlink,
     [
       AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 

diff --git a/m4/free.m4 b/m4/free.m4
index 99ebc9ae994303f9137806fb7c0c29ac48c9fb7e..cb7b1c666dc1fa5980fd5a43fd2d0f000e4b3bcb 100644 (file)
--- a/m4/free.m4
+++ b/m4/free.m4
@@ -1,6 +1,6 @@
 # Check whether free (NULL) is supposed to work.
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,9 +21,7 @@ AC_DEFUN([gl_FUNC_FREE],
     [gl_cv_func_free],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-         [[@%:@if HAVE_UNISTD_H
-             @%:@include <unistd.h>
-           @%:@endif]],
+         [[@%:@include <unistd.h>]],
          [[@%:@if _POSIX_VERSION < 199009L && \
                (defined unix || defined _unix || defined _unix_ \
                 || defined __unix || defined __unix__)

diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index 2e854751169baf7929b7a67fa144617fc30b0616..93b3091b60ee44ed2ed40d2cd60b7c861f29739d 100644 (file)
--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -17,9 +17,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
      [AC_TRY_RUN(
         [
 #       include <stdlib.h>
-#       ifdef HAVE_UNISTD_H
-#        include <unistd.h>
-#       endif
+#       include <unistd.h>
 #       ifndef getcwd
         char *getcwd ();
 #       endif

diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 813369b00883d3fb3959830f4f170b765665cc1b..f67b48d544fa88ede5542986f863ec23067e13a7 100644 (file)
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,8 +1,8 @@
-#serial 5
+#serial 6
 dnl Run a program to determine whether whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
-# Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -24,9 +24,7 @@ AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK],
       [
 #       include <sys/types.h>
 #       include <sys/stat.h>
-#       ifdef HAVE_UNISTD_H
-#        include <unistd.h>
-#       endif
+#       include <unistd.h>
 
 #       define SAME_INODE(Stat_buf_1, Stat_buf_2) \
          ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \

diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 25ca6dc46d74f695dfd52eb85cf15a767986ada0..554ad25c9bf2e6205595f920b03db4d37af45123 100644 (file)
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,5 +1,5 @@
-# mktime.m4 serial 5
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+#serial 6
+dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -34,9 +34,7 @@ AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime,
 # include <stdlib.h>
 #endif
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if !HAVE_ALARM
 # define alarm(X) /* empty */