diff options
author | Astonex <softukitu@gmail.com> | 2013-07-31 23:02:09 +0100 |
---|---|---|
committer | Astonex <softukitu@gmail.com> | 2013-07-31 23:02:09 +0100 |
commit | f05aa308701f33f3bf9df022a4b376deeedef235 (patch) | |
tree | c10b8a3cca6822400853bfd3bc2c5fd1cca73f83 /core/network.h | |
parent | 8dfba27242ca23fca5de852541f2101568dbf7cb (diff) | |
parent | c558cb63f6db35bd51f2f2331e21df03105ee82a (diff) |
Merge remote-tracking branch 'ProjectTox/master'
Diffstat (limited to 'core/network.h')
-rw-r--r-- | core/network.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/network.h b/core/network.h index aaaaa409..3277070c 100644 --- a/core/network.h +++ b/core/network.h | |||
@@ -56,11 +56,7 @@ | |||
56 | /* we use libsodium by default */ | 56 | /* we use libsodium by default */ |
57 | #include <sodium.h> | 57 | #include <sodium.h> |
58 | #else | 58 | #else |
59 | 59 | #include <crypto_box.h> | |
60 | /* TODO: Including stuff like this is bad. This needs fixing. | ||
61 | We keep support for the original NaCl for now. */ | ||
62 | #include "../nacl/build/Linux/include/amd64/crypto_box.h" | ||
63 | |||
64 | #endif | 60 | #endif |
65 | 61 | ||
66 | #ifdef __cplusplus | 62 | #ifdef __cplusplus |
@@ -125,7 +121,7 @@ void shutdown_networking(); | |||
125 | address should represent IPv4, IPv6 or a hostname | 121 | address should represent IPv4, IPv6 or a hostname |
126 | on success returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i | 122 | on success returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i |
127 | on failure returns -1 */ | 123 | on failure returns -1 */ |
128 | int resolve_addr(char *address); | 124 | int resolve_addr(const char *address); |
129 | 125 | ||
130 | #ifdef __cplusplus | 126 | #ifdef __cplusplus |
131 | } | 127 | } |