Remove K&R cruft.

diff --git a/lib/strndup.c b/lib/strndup.c
index 136e51c736d4c8656cd2ab3f11767028a876e554..f85627e879d2f4f891060b0171f63924161068e1 100644 (file)
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -21,15 +21,8 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
-
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #ifndef HAVE_DECL_STRNLEN
 "this configure-time declaration test was not run"
@@ -55,7 +48,7 @@ __strndup (const char *s, size_t n)
     return NULL;
 
   new[len] = '\0';
-  return (char *) memcpy (new, s, len);
+  return memcpy (new, s, len);
 }
 #ifdef weak_alias
 weak_alias (__strndup, strndup)

diff --git a/m4/strndup.m4 b/m4/strndup.m4
index f2f5cfea6152836ae568a68b9a2c46b58f4d5aa0..80dfcc1d90b37d3bff98d89734e373cc4cd44031 100644 (file)
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,5 +1,5 @@
-# strndup.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strndup.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
@@ -19,7 +19,6 @@ AC_DEFUN([gl_FUNC_STRNDUP],
 
 # Prerequisites of lib/strndup.c.
 AC_DEFUN([gl_PREREQ_STRNDUP], [
-  AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_DECLS(strnlen)
 ])