summaryrefslogtreecommitdiff
path: root/other
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-08-30 08:16:34 -0400
committerirungentoo <irungentoo@gmail.com>2013-08-30 08:16:34 -0400
commit8f0bef5f20e5f9518889010387edce4d3af9b3dc (patch)
tree87e8f2e3d9fbdd223def556698ef9952b8620ce3 /other
parent7441a234b7f6dae025819bc2717026d6462e151a (diff)
Fixed warnings and moved hex_string_to_bin to testing/
Diffstat (limited to 'other')
-rw-r--r--other/DHT_bootstrap.c2
-rw-r--r--other/Makefile.inc3
2 files changed, 2 insertions, 3 deletions
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 54e4f07d..a42545b1 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 "../toxcore/misc_tools.h" 32#include "../testing/misc_tools.c"
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 c737b642..7442fb39 100644
--- a/other/Makefile.inc
+++ b/other/Makefile.inc
@@ -2,8 +2,7 @@ noinst_PROGRAMS += DHT_bootstrap
2 2
3DHT_bootstrap_SOURCES = $(top_srcdir)/other/DHT_bootstrap.c \ 3DHT_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)/toxcore/misc_tools.h
7 6
8DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \ 7DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \
9 $(LIBSODIUM_CFLAGS) 8 $(LIBSODIUM_CFLAGS)