diff options
| author |   Stanislav Brabec <utx@penguin.cz> | 2011-05-23 22:08:30 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2011-05-23 22:08:30 +0000 |
| commit | 880742f2072a3acb10637b4de7230b55910920b8 (patch) | |
| tree | 5da0b12a2c00a76de137656522afc3ebdaee570c /recipes/bluez/bluez-hcidump-2.0 | |
| parent | 5a32c2a86bc59bc6a1bd3abde5c771d7996cce62 (diff) | |
| download | openembedded-880742f2072a3acb10637b4de7230b55910920b8.tar.gz | |
bluez-hcidump: Fix declaration clash (remove definition of ntoh64() already present in bluetooth.h).
Signed-off-by: Stanislav Brabec <utx@penguin.cz>
Diffstat (limited to 'recipes/bluez/bluez-hcidump-2.0')
| -rw-r--r-- | recipes/bluez/bluez-hcidump-2.0/fix-declaration-clash.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes/bluez/bluez-hcidump-2.0/fix-declaration-clash.patch b/recipes/bluez/bluez-hcidump-2.0/fix-declaration-clash.patch new file mode 100644 index 0000000000..0f1a2f7109 --- /dev/null +++ b/recipes/bluez/bluez-hcidump-2.0/fix-declaration-clash.patch @@ -0,0 +1,27 @@ +Index: bluez-hcidump-2.0/src/hcidump.c +=================================================================== +--- bluez-hcidump-2.0.orig/src/hcidump.c ++++ bluez-hcidump-2.0/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"; + |