From: Michael Cree <mcree@orcon.net.nz>
Date: Sun, 26 Sep 2010 08:15:51 +0000 (+1300)
Subject: alpha: Fix compile errors in memchr
X-Git-Tag: upstream/2.30~10627^2~451
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b54f998dc380ce327a7faf2c40e569fb2cf39bf0;p=external%2Fglibc.git

alpha: Fix compile errors in memchr

Include missing header file and make some casts explicit.
---

diff --git a/sysdeps/alpha/memchr.c b/sysdeps/alpha/memchr.c
index c52841b..7e16f8a 100644
--- a/sysdeps/alpha/memchr.c
+++ b/sysdeps/alpha/memchr.c
@@ -17,6 +17,7 @@
    02111-1307 USA.  */
 
 #include <string.h>
+#include <bp-sym.h>
 
 typedef unsigned long word;
 
@@ -53,11 +54,11 @@ __memchr (const void *s, int xc, size_t n)
 
   /* Align the source, and decrement the count by the number
      of bytes searched in the first word.  */
-  s_align = (const word *)(s & -8);
-  n += (s & 7);
+  s_align = (const word *)((word)s & -8);
+  n += ((word)s & 7);
 
   /* Deal with misalignment in the first word for the comparison.  */
-  mask = (1ul << (s & 7)) - 1;
+  mask = (1ul << ((word)s & 7)) - 1;
 
   /* If the entire string fits within one word, we may need masking
      at both the front and the back of the string.  */