merge from gcc

This commit is contained in:
DJ Delorie
2005-03-25 04:27:21 +00:00
parent 695a4822ce
commit 51e32d644a
3 changed files with 14 additions and 4 deletions

View File

@@ -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);
}