From: Anderson Lizardo Date: Fri, 18 Mar 2011 19:10:19 +0000 (-0400) Subject: Fix compilation against latest BlueZ X-Git-Tag: 2.1~21 X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez-hcidump.git;a=commitdiff_plain;h=95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8 Fix compilation against latest BlueZ BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the hcidump local copy is not necessary. --- diff --git a/src/hcidump.c b/src/hcidump.c index af086c7..2023130 100644 --- a/src/hcidump.c +++ b/src/hcidump.c @@ -50,22 +50,6 @@ #include "parser/parser.h" #include "parser/sdp.h" -#if __BYTE_ORDER == __LITTLE_ENDIAN -static inline uint64_t ntoh64(uint64_t n) -{ - uint64_t h; - uint64_t tmp = ntohl(n & 0x00000000ffffffff); - h = ntohl(n >> 32); - h |= tmp << 32; - return h; -} -#elif __BYTE_ORDER == __BIG_ENDIAN -#define ntoh64(x) (x) -#else -#error "Unknown byte order" -#endif -#define hton64(x) ntoh64(x) - #define SNAP_LEN HCI_MAX_FRAME_SIZE #define DEFAULT_PORT "10839";