From 2f79e30906e2d729a48b295521cba4ed5d6067dc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 2 Jul 2005 08:54:13 +0000 Subject: Assume HAVE_UNISTD_H, i.e., that works. --- m4/check-decl.m4 | 6 ++---- m4/chown.m4 | 6 ++---- m4/free.m4 | 6 ++---- m4/getcwd.m4 | 4 +--- m4/link-follow.m4 | 8 +++----- m4/mktime.m4 | 8 +++----- 6 files changed, 13 insertions(+), 25 deletions(-) diff --git a/m4/check-decl.m4 b/m4/check-decl.m4 index d70e1c90f..66c581055 100644 --- 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 #include -#if HAVE_UNISTD_H -# include -#endif +#include #include #if TIME_WITH_SYS_TIME diff --git a/m4/chown.m4 b/m4/chown.m4 index 39f6bb6a3..389f0f97e 100644 --- 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 -#endif +#include #include #include diff --git a/m4/free.m4 b/m4/free.m4 index 99ebc9ae9..cb7b1c666 100644 --- 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 - @%:@endif]], + [[@%:@include ]], [[@%:@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 2e8547511..93b3091b6 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -17,9 +17,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], [AC_TRY_RUN( [ # include -# ifdef HAVE_UNISTD_H -# include -# endif +# include # ifndef getcwd char *getcwd (); # endif diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index 813369b00..f67b48d54 100644 --- 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 # include -# ifdef HAVE_UNISTD_H -# include -# endif +# include # 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 25ca6dc46..554ad25c9 100644 --- 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 #endif -#if HAVE_UNISTD_H -# include -#endif +#include #if !HAVE_ALARM # define alarm(X) /* empty */ -- cgit v1.2.3-70-g09d2