X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrndup.c;h=f85627e879d2f4f891060b0171f63924161068e1;hb=39e82e46dde285e3ed536bf9b089904cd2b04c3c;hp=6f59717cfab46b0c6dd3d6f326cc87fc75e57888;hpb=0171fae6af885d8e76fb03a7f64f6f68fc6c5dd1;p=gnulib.git

diff --git a/lib/strndup.c b/lib/strndup.c
index 6f59717cf..f85627e87 100644
--- 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,14 +21,14 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
 
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
+#ifndef HAVE_DECL_STRNLEN
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_STRNLEN
+size_t strnlen ();
 #endif
 
 #undef __strndup
@@ -48,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)