[25/37] incubator-mynewt-core git commit: bletiny - fix build error in sim

[we...@apache.org]

bletiny - fix build error in sim


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/07746cc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/07746cc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/07746cc0

Branch: refs/heads/nrf_cputime
Commit: 07746cc052ed1b22b0efa23dcc24e6a17234cdd2
Parents: badc6e9
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Mar 28 18:04:22 2017 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Mar 28 18:04:22 2017 -0700

----------------------------------------------------------------------
 apps/bletiny/src/cmd.c  | 3 +--
 apps/bletiny/src/main.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/07746cc0/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index 45debc5..15563a0 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -1796,8 +1796,7 @@ cmd_show_coc(int argc, char **argv)
         console_printf("conn_handle: 0x%04x\n", conn->handle);
         j = 0;
         SLIST_FOREACH(coc, &conn->coc_list, next) {
-            console_printf("    idx: %i, chan pointer = 0x%08lx\n", j++,
-                           (uint32_t)coc->chan);
+            console_printf("    idx: %i, chan pointer = %p\n", j++, coc->chan);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/07746cc0/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index 8ee724e..96ac90e 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -1847,7 +1847,7 @@ bletiny_l2cap_send(uint16_t conn_handle, uint16_t idx, uint16_t bytes)
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+main(int argc, char **argv)
 {
     int rc;