Remove K&R cruft.

diff --git a/lib/hard-locale.c b/lib/hard-locale.c
index 0070542e09fac2893b0ed5f2f9ac26f3e5b67861..8c0ee8c7778f090335bed068e0e3dfb35e508f3f 100644 (file)
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -1,6 +1,6 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
 /* hard-locale.c -- Determine whether a locale is hard.
 

-   Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2002, 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
 
    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,19 +20,14 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

+#include "hard-locale.h"
+

 #if HAVE_LOCALE_H
 # include <locale.h>
 #endif
 
 #if HAVE_LOCALE_H
 # include <locale.h>
 #endif
 

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-
-#include "hard-locale.h"
+#include <stdlib.h>
+#include <string.h>

 
 /* Return nonzero if the current CATEGORY locale is hard, i.e. if you
    can't get away with assuming traditional C or POSIX behavior.  */
 
 /* Return nonzero if the current CATEGORY locale is hard, i.e. if you
    can't get away with assuming traditional C or POSIX behavior.  */

diff --git a/lib/hash.c b/lib/hash.c
index 7373a011ceceef9f94faa1c5a55d1409139b7e52..3948ce4cf69d3b4dfaeaa3e79c8f44883d8befec 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -27,27 +27,11 @@
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif

 
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>

-
-#ifndef HAVE_DECL_FREE
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_FREE
-void free ();
-#endif
-
-#ifndef HAVE_DECL_MALLOC
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_MALLOC
-char *malloc ();
-#endif
+#include <stdlib.h>

 
 #if USE_OBSTACK
 # include "obstack.h"
 
 #if USE_OBSTACK
 # include "obstack.h"

diff --git a/lib/human.c b/lib/human.c
index 285e4fd55e8c41bbdf11bf871cb0d09adc5e08d6..b342bf178445d2d4f68ad51999ab579be98df988 100644 (file)
--- a/lib/human.c
+++ b/lib/human.c
@@ -36,25 +36,9 @@
 # include <locale.h>
 #endif
 
 # include <locale.h>
 #endif
 

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifndef HAVE_DECL_GETENV
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_GETENV
-char *getenv ();
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/m4/hard-locale.m4 b/m4/hard-locale.m4
index 79f24d28dbd5bb9aa7b8fc6e8793e95ead552b65..3e2a08ccb5bb2f26042d4518514b5f9134958308 100644 (file)
--- a/m4/hard-locale.m4
+++ b/m4/hard-locale.m4
@@ -1,5 +1,5 @@
-# hard-locale.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# hard-locale.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
 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


@@ -9,6 +9,6 @@ dnl the same distribution terms as the rest of that program.
 AC_DEFUN([gl_HARD_LOCALE],
 [
   dnl Prerequisites of lib/hard-locale.c.
 AC_DEFUN([gl_HARD_LOCALE],
 [
   dnl Prerequisites of lib/hard-locale.c.

-  AC_CHECK_HEADERS_ONCE(locale.h stdlib.h string.h)
+  AC_CHECK_HEADERS_ONCE(locale.h)

   AC_CHECK_FUNCS_ONCE(setlocale)
 ])
   AC_CHECK_FUNCS_ONCE(setlocale)
 ])

diff --git a/m4/hash.m4 b/m4/hash.m4
index ab48a1d230d84226ca6f6dbdd26fa07a37d9ba23..9fe3211f91c1dd3fb813dce4324f29c0527c78af 100644 (file)
--- a/m4/hash.m4
+++ b/m4/hash.m4
@@ -1,4 +1,4 @@
-# hash.m4 serial 2
+# hash.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
 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,6 +10,4 @@ AC_DEFUN([gl_HASH],
 [
   dnl Prerequisites of lib/hash.c.
   AC_REQUIRE([AM_STDBOOL_H])
 [
   dnl Prerequisites of lib/hash.c.
   AC_REQUIRE([AM_STDBOOL_H])

-  AC_CHECK_HEADERS_ONCE(stdlib.h)
-  AC_CHECK_DECLS_ONCE(free malloc)

 ])
 ])

diff --git a/m4/human.m4 b/m4/human.m4
index 1a23f166fe5a8ab84b0b916ee2163d97b451aba9..a2b2365700c5a305f074998ecdf7b3fb98603c19 100644 (file)
--- a/m4/human.m4
+++ b/m4/human.m4
@@ -1,4 +1,4 @@
-# human.m4 serial 3
+# human.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
 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


@@ -13,7 +13,6 @@ AC_DEFUN([gl_HUMAN],
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
 
   dnl Prerequisites of lib/human.c.
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
 
   dnl Prerequisites of lib/human.c.

-  AC_CHECK_HEADERS_ONCE(locale.h stdlib.h string.h)
-  AC_CHECK_DECLS_ONCE(getenv)
+  AC_CHECK_HEADERS_ONCE(locale.h)

   AC_CHECK_FUNCS_ONCE(localeconv)
 ])
   AC_CHECK_FUNCS_ONCE(localeconv)
 ])