[oe-commits] Stanislav Brabec : bluez-hcidump: Fix declaration clash ( remove definition of ntoh64() already present in bluetooth.h).

[git version control]

Module: openembedded.git
Branch: master
Commit: 880742f2072a3acb10637b4de7230b55910920b8
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=880742f2072a3acb10637b4de7230b55910920b8

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Mon May 23 22:08:30 2011 +0000

bluez-hcidump: Fix declaration clash (remove definition of ntoh64() already present in bluetooth.h).
Signed-off-by: Stanislav Brabec <utx at penguin.cz>

---

 .../bluez-hcidump-2.0/fix-declaration-clash.patch  |   27 ++++++++++++++++++++
 recipes/bluez/bluez-hcidump_2.0.bb                 |    7 ++---
 2 files changed, 30 insertions(+), 4 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 0000000..0f1a2f7
--- /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";
+ 
diff --git a/recipes/bluez/bluez-hcidump_2.0.bb b/recipes/bluez/bluez-hcidump_2.0.bb
index 94a7097..2193ff4 100644
--- a/recipes/bluez/bluez-hcidump_2.0.bb
+++ b/recipes/bluez/bluez-hcidump_2.0.bb
@@ -3,11 +3,10 @@ SECTION = "console"
 PRIORITY = "optional"
 DEPENDS = "bluez-libs"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz"
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz\
+	   file://fix-declaration-clash.patch"
 S = "${WORKDIR}/bluez-hcidump-${PV}"
 
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"