diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
| commit | f8a2a865dc32bfa626cc150a509d30d897e1181b (patch) | |
| tree | 5bb6b234149cdf2a79422815dc59a0c53cb3cb0e /toxcore/DHT.c | |
| parent | a9a7f6a5952d0385904ec9df078ac065a3f5887f (diff) | |
| parent | c4f0650ae33e1669bfc994ef4f76c6c31e4d63c0 (diff) | |
Resolved conflicts when merging upstream
Diffstat (limited to 'toxcore/DHT.c')
| -rw-r--r-- | toxcore/DHT.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxcore/DHT.c b/toxcore/DHT.c index 133e9392..77d126c1 100644 --- a/toxcore/DHT.c +++ b/toxcore/DHT.c | |||
| @@ -2212,7 +2212,7 @@ static int random_node_fromlist(Client_data *list, uint16_t list_size, Node_form | |||
| 2212 | * | 2212 | * |
| 2213 | * TODO: remove the LAN stuff from this. | 2213 | * TODO: remove the LAN stuff from this. |
| 2214 | */ | 2214 | */ |
| 2215 | uint16_t random_nodes_path(DHT *dht, Node_format *nodes, uint16_t max_num) | 2215 | uint16_t random_nodes_path(const DHT *dht, Node_format *nodes, uint16_t max_num) |
| 2216 | { | 2216 | { |
| 2217 | if (max_num == 0) | 2217 | if (max_num == 0) |
| 2218 | return 0; | 2218 | return 0; |