diff --git a/qtconnectivity-opensource-src-5.4.0-bswap_16.patch b/qtconnectivity-opensource-src-5.4.0-bswap_16.patch index 5e9944a..740f64d 100644 --- a/qtconnectivity-opensource-src-5.4.0-bswap_16.patch +++ b/qtconnectivity-opensource-src-5.4.0-bswap_16.patch @@ -1,13 +1,14 @@ -diff -up qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/bluez_data_p.h.bswap_16 qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/bluez_data_p.h ---- qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/bluez_data_p.h.bswap_16 2014-12-05 10:25:14.000000000 -0600 -+++ qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/bluez_data_p.h 2014-12-11 16:38:36.791660457 -0600 -@@ -167,6 +167,9 @@ static inline uint16_t bt_get_le16(const - return bt_get_unaligned((const uint16_t *) ptr); +diff --git a/src/bluetooth/bluez/bluez_data_p.h b/src/bluetooth/bluez/bluez_data_p.h +index 9d0d9d9..92f0e63 100644 +--- a/src/bluetooth/bluez/bluez_data_p.h ++++ b/src/bluetooth/bluez/bluez_data_p.h +@@ -168,6 +168,9 @@ static inline quint16 bt_get_le16(const void *ptr) + return bt_get_unaligned((const quint16 *) ptr); } #elif __BYTE_ORDER == __BIG_ENDIAN +#ifndef bswap_16 +#define bswap_16(x) (((x) & 0x00ff) << 8 | ((x) & 0xff00) >> 8) +#endif - static inline uint16_t bt_get_le16(const void *ptr) + static inline quint16 bt_get_le16(const void *ptr) { - return bswap_16(bt_get_unaligned((const uint16_t *) ptr)); + return qbswap(bt_get_unaligned((const quint16 *) ptr));