diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2015-11-02 23:05:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.200> | 2015-11-02 23:05:11 +0000 |
| commit | 0ef8a183969cc9c3c51feb7dca5025e5773840f5 (patch) | |
| tree | 4db6940632651fc9f1eec7ee3e2b68162bf926c7 | |
| parent | bcffdc9f89d2f9677b1092997947b93454a4bc01 (diff) | |
| parent | 6dca2977fc5332662f8d25c89104b95c310665e5 (diff) | |
Merge "Fix compilation issue when using bluetooth/bluetooth.h in C++"
| -rw-r--r-- | recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch | 23 | ||||
| -rw-r--r-- | recipes-connectivity/bluez5/bluez5_%.bbappend | 5 |
2 files changed, 28 insertions, 0 deletions
diff --git a/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch b/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch new file mode 100644 index 000000000..ba2f33c62 --- /dev/null +++ b/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch @@ -0,0 +1,23 @@ +diff -urN bluez-5.22.orig/lib/bluetooth.h bluez-5.22/lib/bluetooth.h +--- bluez-5.22.orig/lib/bluetooth.h 2013-12-10 15:59:06.000000000 +0900 ++++ bluez-5.22/lib/bluetooth.h 2015-10-28 13:34:25.749335768 +0900 +@@ -158,16 +158,16 @@ + #define bt_get_unaligned(ptr) \ + ({ \ + struct __attribute__((packed)) { \ +- typeof(*(ptr)) __v; \ +- } *__p = (typeof(__p)) (ptr); \ ++ __typeof__(*(ptr)) __v; \ ++ } *__p = (__typeof__(__p)) (ptr); \ + __p->__v; \ + }) + + #define bt_put_unaligned(val, ptr) \ + do { \ + struct __attribute__((packed)) { \ +- typeof(*(ptr)) __v; \ +- } *__p = (typeof(__p)) (ptr); \ ++ __typeof__(*(ptr)) __v; \ ++ } *__p = (__typeof__(__p)) (ptr); \ + __p->__v = (val); \ + } while(0) diff --git a/recipes-connectivity/bluez5/bluez5_%.bbappend b/recipes-connectivity/bluez5/bluez5_%.bbappend new file mode 100644 index 000000000..014b2fa00 --- /dev/null +++ b/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" + +SRC_URI_append = "\ + file://0001_fix_compile_issue_when_using_in_c++.patch \ +" |