You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/03/09 20:32:53 UTC

incubator-mynewt-core git commit: Undef byte swapping macros that exist in some envs.

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/master 963ff4db9 -> 849ca1da9


Undef byte swapping macros that exist in some envs.

This allows the nimble unit tests to compile in sim on my linux machine.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/849ca1da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/849ca1da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/849ca1da

Branch: refs/heads/master
Commit: 849ca1da91eadc739c845b00f329ce4ad8ab6e97
Parents: 963ff4d
Author: ccollins at iori.nightmare.heaven <cc...@iori.nightmare-heaven.no-ip.biz>
Authored: Wed Mar 9 09:57:25 2016 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Wed Mar 9 11:32:30 2016 -0800

----------------------------------------------------------------------
 net/nimble/include/nimble/ble.h | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/849ca1da/net/nimble/include/nimble/ble.h
----------------------------------------------------------------------
diff --git a/net/nimble/include/nimble/ble.h b/net/nimble/include/nimble/ble.h
index e9a1e93..babb3ac 100644
--- a/net/nimble/include/nimble/ble.h
+++ b/net/nimble/include/nimble/ble.h
@@ -109,6 +109,12 @@ struct ble_mbuf_hdr
 extern uint8_t g_dev_addr[BLE_DEV_ADDR_LEN];
 extern uint8_t g_random_addr[BLE_DEV_ADDR_LEN];
 
+#undef htole16
+#undef htole32
+#undef htole64
+#undef le16toh
+#undef le32toh
+#undef le64toh
 void htole16(void *buf, uint16_t x);
 void htole32(void *buf, uint32_t x);
 void htole64(void *buf, uint64_t x);