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/09/15 18:52:36 UTC
incubator-mynewt-core git commit: mn_socket - Fix multiple definition
nm_if6addr_any
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 54fe9e7e3 -> 97c5750a9
mn_socket - Fix multiple definition nm_if6addr_any
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/97c5750a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/97c5750a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/97c5750a
Branch: refs/heads/develop
Commit: 97c5750a9aa3965cc4ca422ae231094b9b44b101
Parents: 54fe9e7
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Sep 15 11:51:33 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Thu Sep 15 11:51:33 2016 -0700
----------------------------------------------------------------------
sys/mn_socket/include/mn_socket/mn_socket.h | 2 +-
sys/mn_socket/src/mn_socket.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/97c5750a/sys/mn_socket/include/mn_socket/mn_socket.h
----------------------------------------------------------------------
diff --git a/sys/mn_socket/include/mn_socket/mn_socket.h b/sys/mn_socket/include/mn_socket/mn_socket.h
index ff4839f..cd3ab06 100644
--- a/sys/mn_socket/include/mn_socket/mn_socket.h
+++ b/sys/mn_socket/include/mn_socket/mn_socket.h
@@ -106,7 +106,7 @@ struct mn_sockaddr_in6 {
uint32_t msin6_addr[4];
};
-const uint32_t nm_in6addr_any[4] = {0,0,0,0};
+extern const uint32_t nm_in6addr_any[4];
/*
* Socket calls.
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/97c5750a/sys/mn_socket/src/mn_socket.c
----------------------------------------------------------------------
diff --git a/sys/mn_socket/src/mn_socket.c b/sys/mn_socket/src/mn_socket.c
index 2a3602c..3e4ba58 100644
--- a/sys/mn_socket/src/mn_socket.c
+++ b/sys/mn_socket/src/mn_socket.c
@@ -30,6 +30,9 @@
*/
static const struct mn_socket_ops *mn_sock_tgt;
+/** All zeros. */
+const uint32_t nm_in6addr_any[4];
+
int
mn_socket_ops_reg(const struct mn_socket_ops *ops)
{