Assume ANSI C.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index f5542b41bbcae9a1ed0b8db82b3264379bd58b6a..13e13b7496067f4e99a19b664f4acadec4f70dde 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -6,6 +6,9 @@
        * unicodeio.c: Include <string.h> unconditionally.
        * setenv.c: Include <stdlib.h> and <string.h> unconditionally.
        * unsetenv.c: Likewise.
+       * xreadlink.c: Include <stdlib.h> unconditionally.
+       * yesno.c: Include <stdlib.h> unconditionally.
+       (rpmatch): Add prototype.
 
 2003-09-10  Jim Meyering  <jim@meyering.net>
 

diff --git a/lib/xreadlink.c b/lib/xreadlink.c
index f5cce16eb8f9adf763c0deec7c44556b66feedc2..e8c677b4438e4b2d3c39cd8337b7ae938624fb1a 100644 (file)
--- a/lib/xreadlink.c
+++ b/lib/xreadlink.c
@@ -31,9 +31,7 @@ extern int errno;
 
 #include <limits.h>
 #include <sys/types.h>
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif

diff --git a/lib/yesno.c b/lib/yesno.c
index 7b928bc3ed0a282d5b59c7fd9c7c530df66f9742..2a6696cd6d1e4d15752636a1fd2e106ea438c3a3 100644 (file)
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,5 +1,5 @@
 /* yesno.c -- read a yes/no response from stdin
-   Copyright (C) 1990, 1998, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2001, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,9 +20,7 @@
 #endif
 
 #include <ctype.h>
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 #include <stdio.h>
 #include "unlocked-io.h"
 
@@ -30,7 +28,7 @@
    and return nonzero if that line begins with y or Y,
    otherwise return 0. */
 
-int rpmatch ();
+extern int rpmatch (char const *response);
 
 int
 yesno ()

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 0cd96979b89ea4de2836023f7bbd4daa74d973bc..cd7977bc595791bdc3fc0ed343973b720f2f533c 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -6,6 +6,8 @@
        * unicodeio.m4 (gl_UNICODEIO): Remove <string.h> check.
        * setenv.m4 (gl_PREREQ_SETENV, gl_PREREQ_UNSETENV): Remove
        <stdlib.h> and <string.h> checks.
+       * xreadlink.m4 (gl_XREADLINK): Remove <stdlib.h> check.
+       * yesno.m4 (gl_YESNO): Remove <stdlib.h> check.
 
 2003-09-09  Paul Eggert  <eggert@twinsun.com>
 

diff --git a/m4/xreadlink.m4 b/m4/xreadlink.m4
index 7062fd1989a372c57a1e809cd4822833d82043b6..5d8e47f92e0c3373d14f7eb17a2d22ffa8cc2fcb 100644 (file)
--- a/m4/xreadlink.m4
+++ b/m4/xreadlink.m4
@@ -1,4 +1,4 @@
-# xreadlink.m4 serial 3
+# xreadlink.m4 serial 4
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,5 +10,5 @@ AC_DEFUN([gl_XREADLINK],
 [
   dnl Prerequisites of lib/xreadlink.c.
   AC_REQUIRE([gt_TYPE_SSIZE_T])
-  AC_CHECK_HEADERS_ONCE(stdlib.h unistd.h)
+  AC_CHECK_HEADERS_ONCE(unistd.h)
 ])

diff --git a/m4/yesno.m4 b/m4/yesno.m4
index fae5f023ddfb72b4d6c27dca6aa901551a882d46..d886b12ab129b21d998f518c1dcef24af12cc0c4 100644 (file)
--- a/m4/yesno.m4
+++ b/m4/yesno.m4
@@ -1,5 +1,5 @@
-# yesno.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# yesno.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -8,6 +8,6 @@ dnl the same distribution terms as the rest of that program.
 
 AC_DEFUN([gl_YESNO],
 [
-  dnl Prerequisites of lib/yesno.c.
-  AC_CHECK_HEADERS_ONCE(stdlib.h)
+  dnl No prerequisites of lib/yesno.c.
+  :
 ])