From b3b80ccabe1f8fd59e46167cc0511cf9fc88f22f Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 8 Sep 2003 23:18:35 +0000
Subject: [PATCH] Remove K&R cruft.

---
 lib/canon-host.c | 10 +++-------
 m4/canon-host.m4 |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/canon-host.c b/lib/canon-host.c
index d2d0746c7f..b0c2f44bb1 100644
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -1,6 +1,6 @@
 /* Host name canonicalization
 
-   Copyright (C) 1995, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -26,12 +26,8 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #ifdef HAVE_NETDB_H
 # include <netdb.h>
 #endif
diff --git a/m4/canon-host.m4 b/m4/canon-host.m4
index 61f66a51fd..3f1f5eb653 100644
--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,4 +1,4 @@
-# canon-host.m4 serial 2
+# canon-host.m4 serial 3
 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
@@ -9,7 +9,7 @@ dnl the same distribution terms as the rest of that program.
 AC_DEFUN([gl_CANON_HOST],
 [
   dnl Prerequisites of lib/canon-host.c.
-  AC_CHECK_HEADERS_ONCE(stdlib.h string.h unistd.h)
+  AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_HEADERS(netdb.h sys/socket.h netinet/in.h arpa/inet.h)
 
   dnl Add any libraries as early as possible.
-- 
2.30.2