diff options
author | irungentoo <irungentoo@gmail.com> | 2013-08-30 07:53:51 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-08-30 07:53:51 -0400 |
commit | 7441a234b7f6dae025819bc2717026d6462e151a (patch) | |
tree | 3b5f42b61e14b6f54687adaf182248337dc93638 /other | |
parent | b37a016b6be8d6c43c368bb566c2c23962a6e571 (diff) | |
parent | eb33796e58cfca4fa26b459ad5a9d013f1df4c42 (diff) |
Merge branch 'udp_connections' of https://github.com/vx-k/ProjectTox-Core into vx-k-udp_connections
Diffstat (limited to 'other')
-rw-r--r-- | other/DHT_bootstrap.c | 2 | ||||
-rw-r--r-- | other/Makefile.inc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c index e3a7397a..54e4f07d 100644 --- a/other/DHT_bootstrap.c +++ b/other/DHT_bootstrap.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include "../toxcore/DHT.h" | 30 | #include "../toxcore/DHT.h" |
31 | #include "../toxcore/friend_requests.h" | 31 | #include "../toxcore/friend_requests.h" |
32 | #include "../testing/misc_tools.h" | 32 | #include "../toxcore/misc_tools.h" |
33 | 33 | ||
34 | /* Sleep function (x = milliseconds) */ | 34 | /* Sleep function (x = milliseconds) */ |
35 | #ifdef WIN32 | 35 | #ifdef WIN32 |
diff --git a/other/Makefile.inc b/other/Makefile.inc index 10ef55a3..c737b642 100644 --- a/other/Makefile.inc +++ b/other/Makefile.inc | |||
@@ -3,8 +3,7 @@ noinst_PROGRAMS += DHT_bootstrap | |||
3 | DHT_bootstrap_SOURCES = $(top_srcdir)/other/DHT_bootstrap.c \ | 3 | DHT_bootstrap_SOURCES = $(top_srcdir)/other/DHT_bootstrap.c \ |
4 | $(top_srcdir)/toxcore/DHT.h \ | 4 | $(top_srcdir)/toxcore/DHT.h \ |
5 | $(top_srcdir)/toxcore/friend_requests.h \ | 5 | $(top_srcdir)/toxcore/friend_requests.h \ |
6 | $(top_srcdir)/testing/misc_tools.h \ | 6 | $(top_srcdir)/toxcore/misc_tools.h |
7 | $(top_srcdir)/testing/misc_tools.c | ||
8 | 7 | ||
9 | DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \ | 8 | DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \ |
10 | $(LIBSODIUM_CFLAGS) | 9 | $(LIBSODIUM_CFLAGS) |