From 40d66dc7f516cb90c73438c46663bf8454ee0760 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Wed, 10 Sep 2003 14:52:49 +0000
Subject: [PATCH] Assume ANSI C.

---
 lib/ChangeLog   | 3 +++
 lib/xreadlink.c | 4 +---
 lib/yesno.c     | 8 +++-----
 m4/ChangeLog    | 2 ++
 m4/xreadlink.m4 | 4 ++--
 m4/yesno.m4     | 8 ++++----
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index f5542b41bb..13e13b7496 100644
--- 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 f5cce16eb8..e8c677b443 100644
--- 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 7b928bc3ed..2a6696cd6d 100644
--- 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 0cd96979b8..cd7977bc59 100644
--- 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 7062fd1989..5d8e47f92e 100644
--- 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 fae5f023dd..d886b12ab1 100644
--- 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.
+  :
 ])
-- 
2.30.2