aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbartpolot <bartpolot@140774ce-b5e7-0310-ab8b-a85725594a96>2012-12-18 19:12:22 +0000
committerbartpolot <bartpolot@140774ce-b5e7-0310-ab8b-a85725594a96>2012-12-18 19:12:22 +0000
commite8f06b92e924db900c4bfdce956e9dd03a59162c (patch)
treeb1e18e292fd8d1aa21524827f2bad781da1cbdb2
parentdbb31553daca5249e52ae109662f43bf031e1755 (diff)
- make distclean && bootstrap fixes
git-svn-id: https://gnunet.org/svn/gnunet@25533 140774ce-b5e7-0310-ab8b-a85725594a96
-rw-r--r--src/mesh/Makefile.am2
-rw-r--r--src/mesh/mesh_test_lib.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index fa6bb59a22..65a813e2b5 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -249,6 +249,8 @@ test_mesh_2dtorus_SOURCES = \
test_mesh_2dtorus.c
test_mesh_2dtorus_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/mesh/libgnunetmeshtest.a
test_mesh_2dtorus_DEPENDENCIES = \
libgnunetmeshtest.a
diff --git a/src/mesh/mesh_test_lib.c b/src/mesh/mesh_test_lib.c
index 7aabc4f771..aa669ca038 100644
--- a/src/mesh/mesh_test_lib.c
+++ b/src/mesh/mesh_test_lib.c
@@ -24,6 +24,7 @@
*/
#include "platform.h"
#include "mesh_test_lib.h"
+#include "gnunet_mesh_service.h"
/**
* Test context for a MESH Test.
@@ -63,17 +64,17 @@ struct GNUNET_MESH_TEST_Context
/**
* Handler for incoming tunnels.
*/
- GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel;
+ GNUNET_MESH_InboundTunnelNotificationHandler *new_tunnel;
/**
* Cleaner for destroyed incoming tunnels.
*/
- GNUNET_MESH_TunnelEndHandler cleaner;
+ GNUNET_MESH_TunnelEndHandler *cleaner;
/**
* Message handlers.
*/
- GNUNET_MESH_MessageHandler* handlers;
+ struct GNUNET_MESH_MessageHandler* handlers;
/**
* Application types.
@@ -266,7 +267,7 @@ GNUNET_MESH_TEST_run (const char *testname,
void *tmain_cls,
GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel,
GNUNET_MESH_TunnelEndHandler cleaner,
- GNUNET_MESH_MessageHandler* handlers,
+ struct GNUNET_MESH_MessageHandler* handlers,
const GNUNET_MESH_ApplicationType* stypes)
{
struct GNUNET_MESH_TEST_Context *ctx;