diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-08-31 19:53:39 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-08-31 19:53:39 -0700 |
| commit | 53d98343b7b444508259f6f1643e8d6724fb11e9 (patch) | |
| tree | c1c87ddf67b6afc66dcac1951dfe5288d509fc20 | |
| parent | d5b48c90edd801f41a40783312deca9f233605ae (diff) | |
| parent | 73bedfcc016e69b682dc916d26490c3810482ce0 (diff) | |
| download | infinitytier-53d98343b7b444508259f6f1643e8d6724fb11e9.tar.gz infinitytier-53d98343b7b444508259f6f1643e8d6724fb11e9.zip | |
Merge branch 'master' into android-jni
| -rw-r--r-- | include/ZeroTierOne.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 8583aa3a..b8d14c5f 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -760,7 +760,11 @@ enum ZT1_ResultCode ZT1_Node_new( ZT1_VirtualNetworkFrameFunction virtualNetworkFrameFunction, ZT1_VirtualNetworkConfigFunction virtualNetworkConfigFunction, ZT1_EventCallback eventCallback, - const char *overrideRootTopology = (const char *)0); + const char *overrideRootTopology +#ifdef __cplusplus + = (const char *)0 +#endif + ); /** * Delete a node and free all resources it consumes @@ -881,7 +885,11 @@ enum ZT1_ResultCode ZT1_Node_leave(ZT1_Node *node,uint64_t nwid); * @param multicastAdi Multicast ADI (least significant 32 bits only, default: 0) * @return OK (0) or error code if a fatal error condition has occurred */ -enum ZT1_ResultCode ZT1_Node_multicastSubscribe(ZT1_Node *node,uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi = 0); +enum ZT1_ResultCode ZT1_Node_multicastSubscribe(ZT1_Node *node,uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi +#ifdef __cplusplus + = 0 +#endif + ); /** * Unsubscribe from an Ethernet multicast group (or all groups) @@ -897,7 +905,11 @@ enum ZT1_ResultCode ZT1_Node_multicastSubscribe(ZT1_Node *node,uint64_t nwid,uin * @param multicastAdi Multicast ADI (least significant 32 bits only, default: 0) * @return OK (0) or error code if a fatal error condition has occurred */ -enum ZT1_ResultCode ZT1_Node_multicastUnsubscribe(ZT1_Node *node,uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi = 0); +enum ZT1_ResultCode ZT1_Node_multicastUnsubscribe(ZT1_Node *node,uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi +#ifdef __cplusplus + = 0 +#endif + ); /** * Get this node's 40-bit ZeroTier address |