diff options
| author | Joseph Henry <josephjah@gmail.com> | 2016-01-15 11:19:25 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2016-01-15 11:19:25 -0800 |
| commit | 7107297c252cb116ea42aae8eb7b9f15957568e6 (patch) | |
| tree | b10adc4474ae1eef080a48ddd3b8ea8da774b388 /include | |
| parent | 35fb602dfffabc73707162bbc278e773e4dbecd6 (diff) | |
| parent | 8af3d352342e10e2ca04b36d5343a3dd1c1850c6 (diff) | |
| download | infinitytier-7107297c252cb116ea42aae8eb7b9f15957568e6.tar.gz infinitytier-7107297c252cb116ea42aae8eb7b9f15957568e6.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/zerotierone into edge
Diffstat (limited to 'include')
| -rw-r--r-- | include/ZeroTierOne.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 8e0d0db3..8a74eafa 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -1241,7 +1241,7 @@ enum ZT_ResultCode ZT_Node_processBackgroundTasks(ZT_Node *node,uint64_t now,vol * @param uptr An arbitrary pointer to associate with this network (default: NULL) * @return OK (0) or error code if a fatal error condition has occurred */ -enum ZT_ResultCode ZT_Node_join(ZT_Node *node,uint64_t nwid,void *uptr = (void *)0); +enum ZT_ResultCode ZT_Node_join(ZT_Node *node,uint64_t nwid,void *uptr); /** * Leave a network @@ -1258,7 +1258,7 @@ enum ZT_ResultCode ZT_Node_join(ZT_Node *node,uint64_t nwid,void *uptr = (void * * @param uptr Target pointer is set to uptr (if not NULL) * @return OK (0) or error code if a fatal error condition has occurred */ -enum ZT_ResultCode ZT_Node_leave(ZT_Node *node,uint64_t nwid,void **uptr = (void **)0); +enum ZT_ResultCode ZT_Node_leave(ZT_Node *node,uint64_t nwid,void **uptr); /** * Subscribe to an Ethernet multicast group |