[GNUnet-SVN] r25533 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-12-18 20:12:22 +0100 (Tue, 18 Dec 2012)
New Revision: 25533

Modified:
   gnunet/src/mesh/Makefile.am
   gnunet/src/mesh/mesh_test_lib.c
Log:
- make distclean && bootstrap fixes

Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-12-18 19:03:02 UTC (rev 25532)
+++ gnunet/src/mesh/Makefile.am 2012-12-18 19:12:22 UTC (rev 25533)
@@ -249,6 +249,8 @@
  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

Modified: gnunet/src/mesh/mesh_test_lib.c
===================================================================
--- gnunet/src/mesh/mesh_test_lib.c     2012-12-18 19:03:02 UTC (rev 25532)
+++ gnunet/src/mesh/mesh_test_lib.c     2012-12-18 19:12:22 UTC (rev 25533)
@@ -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 @@
   /**
    * 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 @@
                       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;