diff options
Diffstat (limited to 'toxcore')
-rw-r--r-- | toxcore/DHT.c | 4 | ||||
-rw-r--r-- | toxcore/LAN_discovery.c | 4 | ||||
-rw-r--r-- | toxcore/Lossless_UDP.c | 4 | ||||
-rw-r--r-- | toxcore/Makefile.inc | 7 | ||||
-rw-r--r-- | toxcore/Messenger.c | 4 | ||||
-rw-r--r-- | toxcore/friend_requests.c | 4 | ||||
-rw-r--r-- | toxcore/net_crypto.c | 4 | ||||
-rw-r--r-- | toxcore/network.c | 4 | ||||
-rw-r--r-- | toxcore/network.h | 2 | ||||
-rw-r--r-- | toxcore/ping.c | 4 | ||||
-rw-r--r-- | toxcore/tox.c | 4 | ||||
-rw-r--r-- | toxcore/util.c | 4 |
12 files changed, 45 insertions, 4 deletions
diff --git a/toxcore/DHT.c b/toxcore/DHT.c index 4807c369..e2d91256 100644 --- a/toxcore/DHT.c +++ b/toxcore/DHT.c | |||
@@ -23,6 +23,10 @@ | |||
23 | 23 | ||
24 | /*----------------------------------------------------------------------------------*/ | 24 | /*----------------------------------------------------------------------------------*/ |
25 | 25 | ||
26 | #ifdef HAVE_CONFIG_H | ||
27 | #include "config.h" | ||
28 | #endif | ||
29 | |||
26 | #include "DHT.h" | 30 | #include "DHT.h" |
27 | #include "ping.h" | 31 | #include "ping.h" |
28 | #include "misc_tools.h" | 32 | #include "misc_tools.h" |
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c index 06e5a677..1980cd93 100644 --- a/toxcore/LAN_discovery.c +++ b/toxcore/LAN_discovery.c | |||
@@ -21,6 +21,10 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifdef HAVE_CONFIG_H | ||
25 | #include "config.h" | ||
26 | #endif | ||
27 | |||
24 | #include "LAN_discovery.h" | 28 | #include "LAN_discovery.h" |
25 | 29 | ||
26 | #define MAX_INTERFACES 16 | 30 | #define MAX_INTERFACES 16 |
diff --git a/toxcore/Lossless_UDP.c b/toxcore/Lossless_UDP.c index 3858716d..fbb473e7 100644 --- a/toxcore/Lossless_UDP.c +++ b/toxcore/Lossless_UDP.c | |||
@@ -26,6 +26,10 @@ | |||
26 | * There are a couple of useless variables to get rid of. | 26 | * There are a couple of useless variables to get rid of. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifdef HAVE_CONFIG_H | ||
30 | #include "config.h" | ||
31 | #endif | ||
32 | |||
29 | #include "Lossless_UDP.h" | 33 | #include "Lossless_UDP.h" |
30 | 34 | ||
31 | 35 | ||
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc index 23584953..5a9002ef 100644 --- a/toxcore/Makefile.inc +++ b/toxcore/Makefile.inc | |||
@@ -29,10 +29,13 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \ | |||
29 | 29 | ||
30 | libtoxcore_la_CFLAGS = -I$(top_srcdir) \ | 30 | libtoxcore_la_CFLAGS = -I$(top_srcdir) \ |
31 | -I$(top_srcdir)/toxcore \ | 31 | -I$(top_srcdir)/toxcore \ |
32 | $(LIBSODIUM_CFLAGS) | 32 | $(LIBSODIUM_CFLAGS) \ |
33 | $(NACL_CFLAGS) | ||
33 | 34 | ||
34 | libtoxcore_la_LDFLAGS = $(EXTRA_LT_LDFLAGS) \ | 35 | libtoxcore_la_LDFLAGS = $(EXTRA_LT_LDFLAGS) \ |
35 | $(LIBSODIUM_LDFLAGS) \ | 36 | $(LIBSODIUM_LDFLAGS) \ |
37 | $(NACL_LDFLAGS) \ | ||
36 | $(WINSOCK2_LIBS) | 38 | $(WINSOCK2_LIBS) |
37 | 39 | ||
38 | libtoxcore_la_LIBS = $(LIBSODIUM_LIBS) | 40 | libtoxcore_la_LIBS = $(LIBSODIUM_LIBS) \ |
41 | $(NAC_LIBS) | ||
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index a1abce41..ff2c31aa 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -21,6 +21,10 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifdef HAVE_CONFIG_H | ||
25 | #include "config.h" | ||
26 | #endif | ||
27 | |||
24 | #include "Messenger.h" | 28 | #include "Messenger.h" |
25 | 29 | ||
26 | #define MIN(a,b) (((a)<(b))?(a):(b)) | 30 | #define MIN(a,b) (((a)<(b))?(a):(b)) |
diff --git a/toxcore/friend_requests.c b/toxcore/friend_requests.c index 6e98f18b..b01015c4 100644 --- a/toxcore/friend_requests.c +++ b/toxcore/friend_requests.c | |||
@@ -21,6 +21,10 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifdef HAVE_CONFIG_H | ||
25 | #include "config.h" | ||
26 | #endif | ||
27 | |||
24 | #include "friend_requests.h" | 28 | #include "friend_requests.h" |
25 | 29 | ||
26 | /* Try to send a friend request to peer with public_key. | 30 | /* Try to send a friend request to peer with public_key. |
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c index b20917cf..a182bb53 100644 --- a/toxcore/net_crypto.c +++ b/toxcore/net_crypto.c | |||
@@ -24,6 +24,10 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #ifdef HAVE_CONFIG_H | ||
28 | #include "config.h" | ||
29 | #endif | ||
30 | |||
27 | #include "net_crypto.h" | 31 | #include "net_crypto.h" |
28 | 32 | ||
29 | #define CONN_NO_CONNECTION 0 | 33 | #define CONN_NO_CONNECTION 0 |
diff --git a/toxcore/network.c b/toxcore/network.c index 9e329949..ed3dff8a 100644 --- a/toxcore/network.c +++ b/toxcore/network.c | |||
@@ -21,6 +21,10 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifdef HAVE_CONFIG_H | ||
25 | #include "config.h" | ||
26 | #endif | ||
27 | |||
24 | #include "network.h" | 28 | #include "network.h" |
25 | 29 | ||
26 | /* return current UNIX time in microseconds (us). */ | 30 | /* return current UNIX time in microseconds (us). */ |
diff --git a/toxcore/network.h b/toxcore/network.h index ca79a81b..2d08e88d 100644 --- a/toxcore/network.h +++ b/toxcore/network.h | |||
@@ -39,8 +39,6 @@ | |||
39 | #include <windows.h> | 39 | #include <windows.h> |
40 | #include <ws2tcpip.h> | 40 | #include <ws2tcpip.h> |
41 | 41 | ||
42 | #undef VANILLA_NACL /* Make sure on Windows we use libsodium. */ | ||
43 | |||
44 | #else // Linux includes | 42 | #else // Linux includes |
45 | 43 | ||
46 | #include <fcntl.h> | 44 | #include <fcntl.h> |
diff --git a/toxcore/ping.c b/toxcore/ping.c index db7333d3..3b39d911 100644 --- a/toxcore/ping.c +++ b/toxcore/ping.c | |||
@@ -5,6 +5,10 @@ | |||
5 | * Copyright 2013 plutooo | 5 | * Copyright 2013 plutooo |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifdef HAVE_CONFIG_H | ||
9 | #include "config.h" | ||
10 | #endif | ||
11 | |||
8 | #include <stdbool.h> | 12 | #include <stdbool.h> |
9 | #include <stdint.h> | 13 | #include <stdint.h> |
10 | 14 | ||
diff --git a/toxcore/tox.c b/toxcore/tox.c index e55f51ca..0af07ede 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -21,6 +21,10 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifdef HAVE_CONFIG_H | ||
25 | #include "config.h" | ||
26 | #endif | ||
27 | |||
24 | #include "Messenger.h" | 28 | #include "Messenger.h" |
25 | /* | 29 | /* |
26 | * returns a FRIEND_ADDRESS_SIZE byte address to give to others. | 30 | * returns a FRIEND_ADDRESS_SIZE byte address to give to others. |
diff --git a/toxcore/util.c b/toxcore/util.c index 59609340..1728ea21 100644 --- a/toxcore/util.c +++ b/toxcore/util.c | |||
@@ -5,6 +5,10 @@ | |||
5 | * Copyright 2013 plutooo | 5 | * Copyright 2013 plutooo |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifdef HAVE_CONFIG_H | ||
9 | #include "config.h" | ||
10 | #endif | ||
11 | |||
8 | #include <time.h> | 12 | #include <time.h> |
9 | #include <stdint.h> | 13 | #include <stdint.h> |
10 | #include <stdbool.h> | 14 | #include <stdbool.h> |