diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-17 17:19:31 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-17 17:19:31 +0000 |
| commit | 8de8a1cb6ef3d5e2cbe73afc12cb86d9af5f4460 (patch) | |
| tree | d7963099f0bf346a6909b8298fd9143303c7d27a /epan/dissectors/packet-dect.c | |
| parent | a1772b01979557b6a6a63a48a36ab3e550effda5 (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-dect.c')
| -rw-r--r-- | epan/dissectors/packet-dect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 66800aaba2..7971ab11c7 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -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]; |