From: Roland McGrath <roland@gnu.org>
Date: Thu, 22 Jul 1993 19:20:18 +0000 (+0000)
Subject: Formerly alpha/memchr.c.~3~
X-Git-Tag: glibc-2.16-ports-before-merge~4241
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a219aa112863e6605439e0db68e31a5e4236c02;p=thirdparty%2Fglibc.git

Formerly alpha/memchr.c.~3~
---

diff --git a/sysdeps/alpha/memchr.c b/sysdeps/alpha/memchr.c
index 3c9477ed4dd..048c9fa2505 100644
--- a/sysdeps/alpha/memchr.c
+++ b/sysdeps/alpha/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1993 Free Software Foundation, Inc.
 
 The GNU C Library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public License as
@@ -33,7 +33,7 @@ memchr (const void *s, int c, size_t n)
   for (char_ptr = s; n > 0 && ((unsigned long int) char_ptr & 7) != 0;
        --n, ++char_ptr)
     if (*char_ptr == c)
-      return char_ptr;
+      return (void *) char_ptr;
 
   longword_ptr = (unsigned long int *) char_ptr;
 
@@ -58,7 +58,7 @@ memchr (const void *s, int c, size_t n)
 	{
 	  /* Which of the bytes was the C?  */
 
-	  const char *cp = (const char *) (longword_ptr - 1);
+	  char *cp = (char *) (longword_ptr - 1);
 
 	  if (cp[0] == c)
 	    return cp;