From 51e32d644ad69408eacefacd21e015a6c9c519c2 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 25 Mar 2005 04:27:21 +0000
Subject: merge from gcc

---
 libiberty/xstrdup.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'libiberty/xstrdup.c')

diff --git a/libiberty/xstrdup.c b/libiberty/xstrdup.c
index 5aa084a768..5ddd2e98a9 100644
--- a/libiberty/xstrdup.c
+++ b/libiberty/xstrdup.c
@@ -19,6 +19,10 @@ obtain memory.
 #endif
 #ifdef HAVE_STRING_H
 #include <string.h>
+#else
+# ifdef HAVE_STRINGS_H
+#  include <strings.h>
+# endif
 #endif
 #include "ansidecl.h"
 #include "libiberty.h"
@@ -29,6 +33,5 @@ xstrdup (s)
 {
   register size_t len = strlen (s) + 1;
   register char *ret = xmalloc (len);
-  memcpy (ret, s, len);
-  return ret;
+  return (char *) memcpy (ret, s, len);
 }
-- 
cgit v1.2.3