setbit() is (AFAIK) defined in <sys/param.h> (OpenBSD) so rename to dect_setbit() to avoid clash. getbit() is also renamed for consistency.
Fixes the issue reported by Stan: http://www.wireshark.org/lists/wireshark-users/200908/msg00128.html svn path=/trunk/; revision=29456
This commit is contained in:
parent
a1772b0197
commit
8de8a1cb6e
|
@ -1098,7 +1098,7 @@ static const value_string PTRFPPower_vals[]=
|
|||
};
|
||||
|
||||
static unsigned char
|
||||
getbit(guint8 *data, int bit)
|
||||
dect_getbit(guint8 *data, int bit)
|
||||
{
|
||||
guint8 c;
|
||||
guint8 byte=data[bit/8];
|
||||
|
@ -1110,7 +1110,7 @@ getbit(guint8 *data, int bit)
|
|||
}
|
||||
|
||||
static void
|
||||
setbit(guint8 *data, int bit, guint8 value)
|
||||
dect_setbit(guint8 *data, int bit, guint8 value)
|
||||
{
|
||||
if(!value)
|
||||
data[bit/8]&=~(1<<(bit%8));
|
||||
|
@ -1129,7 +1129,7 @@ calc_xcrc(guint8* data, guint8 length)
|
|||
|
||||
for(y=0;y<80;y++)
|
||||
{
|
||||
setbit(bits, y, getbit(data, y+48*(1+(int)(y/16))));
|
||||
dect_setbit(bits, y, dect_getbit(data, y+48*(1+(int)(y/16))));
|
||||
}
|
||||
length=10;
|
||||
crc=bits[0];
|
||||
|
|
Loading…
Reference in New Issue