merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index b085addcfb16a48d965418d599e01bbb1ac97b22..30295c21d3e2b9411af4695482a3923e170f01dd 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-15  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * strdup.c (strdup): Constify the argument.
+
 2004-01-14  Loren J. Rittle  <ljrittle@acm.org>
 
        * Makefile.in (distclean): Remove config.cache.

diff --git a/libiberty/strdup.c b/libiberty/strdup.c
index 071a4a401af754fb847734f54bc7fc60e3204744..a3f17d3bcb1e6f63da5885718b16c18fc091eac6 100644 (file)
--- a/libiberty/strdup.c
+++ b/libiberty/strdup.c
@@ -22,7 +22,7 @@ extern PTR    memcpy PARAMS ((PTR, const PTR, size_t));
 
 char *
 strdup(s)
-     char *s;
+     const char *s;
 {
   size_t len = strlen (s) + 1;
   char *result = (char*) malloc (len);