diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-04-30 13:52:21 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-04-30 13:52:21 -0400 |
| commit | 67df296650a72b8769fac58787148080ec771805 (patch) | |
| tree | 121b2de24f67b7591b9e8ebda3bc9aa0c84ffbff /src/p2p | |
| parent | prompt to delete build directory on 'make clean' (diff) | |
| download | monero-67df296650a72b8769fac58787148080ec771805.tar.xz | |
various fixes to allow mac osx compilation
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/net_node.inl | 4 | ||||
| -rw-r--r-- | src/p2p/p2p_protocol_defs.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index eeb3f6ffe..4dafa2342 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -745,7 +745,9 @@ namespace nodetool template<class t_payload_net_handler> bool node_server<t_payload_net_handler>::get_local_node_data(basic_node_data& node_data) { - time(&node_data.local_time); + time_t local_time; + time(&local_time); + node_data.local_time = local_time; node_data.peer_id = m_config.m_peer_id; if(!m_hide_my_port) node_data.my_port = m_external_port ? m_external_port : m_listenning_port; diff --git a/src/p2p/p2p_protocol_defs.h b/src/p2p/p2p_protocol_defs.h index 9994dca4c..fdf784f49 100644 --- a/src/p2p/p2p_protocol_defs.h +++ b/src/p2p/p2p_protocol_defs.h @@ -86,7 +86,7 @@ namespace nodetool struct basic_node_data { uuid network_id; - time_t local_time; + uint64_t local_time; uint32_t my_port; peerid_type peer_id; @@ -153,7 +153,7 @@ namespace nodetool struct response { - time_t local_time; + uint64_t local_time; t_playload_type payload_data; std::list<peerlist_entry> local_peerlist; |