From 9b5a9c0f2dedbc9b75930d4d6704966f0a3c7308 Mon Sep 17 00:00:00 2001 From: Monty Date: Mon, 8 Mar 2004 04:10:00 +0000 Subject: Fix for bug 498 (B_look() and B_read() broken on 64 bit archs) git-svn-id: http://svn.xiph.org/trunk/ogg@5904 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- src/bitwise.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/bitwise.c b/src/bitwise.c index ec4d72b..6a1f24e 100644 --- a/src/bitwise.c +++ b/src/bitwise.c @@ -11,7 +11,7 @@ ******************************************************************** function: packing variable sized words into an octet stream - last mod: $Id: bitwise.c,v 1.17 2003/11/10 13:06:08 xiphmont Exp $ + last mod: $Id: bitwise.c,v 1.18 2004/03/08 04:10:00 xiphmont Exp $ ********************************************************************/ @@ -170,7 +170,7 @@ static void oggpack_writecopy_helper(oggpack_buffer *b, b->ptr=b->buffer+b->endbyte; } - memmove(b->ptr,source,bytes); + bcopy(source,b->ptr,bytes); b->ptr+=bytes; b->buffer+=bytes; *b->ptr=0; @@ -272,7 +272,7 @@ long oggpackB_look(oggpack_buffer *b,int bits){ } } } - return (ret>>(m>>1))>>((m+1)>>1); + return ((ret&0xffffffff)>>(m>>1))>>((m+1)>>1); } long oggpack_look1(oggpack_buffer *b){ @@ -369,7 +369,7 @@ long oggpackB_read(oggpack_buffer *b,int bits){ } } } - ret=(ret>>(m>>1))>>((m+1)>>1); + ret=((ret&0xffffffff)>>(m>>1))>>((m+1)>>1); overflow: -- cgit v1.2.1