diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2015-10-28 17:05:47 +0900 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2015-10-28 17:24:38 +0900 |
| commit | 6dca2977fc5332662f8d25c89104b95c310665e5 (patch) | |
| tree | da7d4f52c5eaf82a4157e3889962e5cb4b666e5a | |
| parent | a520f91e5192f553f93b684529b1d2bec45d1ecb (diff) | |
Fix compilation issue when using bluetooth/bluetooth.h in C++
Fix compilation issue when building qtsystems-examples in Qt5.5.1.
The reason is because Bluetooth header (/usr/include/bluetooth/bluetooth.h)
is not valid in strict C syntax (e.g. c++11).
Change-Id: Ie6d48faf27047833faed8c1eec1c09240dc7b7e1
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
| -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 00000000..ba2f33c6 --- /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 00000000..014b2fa0 --- /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 \ +" |