diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-05-12 11:40:25 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-05-12 11:40:25 +0000 |
commit | fc0a771cc812c31d3974f45f680b7c6d5cde8e59 (patch) | |
tree | 7dad31185ffb7075eec61026addda8c217a2f511 /src | |
parent | fa75ce82dfcf5b0a093fcbc67ae03454d5c4f53e (diff) | |
download | gnunet-fc0a771cc812c31d3974f45f680b7c6d5cde8e59.tar.gz gnunet-fc0a771cc812c31d3974f45f680b7c6d5cde8e59.zip |
- revert not-ready changes
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/Makefile.am | 6 | ||||
-rw-r--r-- | src/mesh/test_mesh_local_1.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index 5ce504e44..84d4838b3 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am | |||
@@ -156,7 +156,7 @@ test_mesh_api_SOURCES = \ | |||
156 | test_mesh_api_LDADD = \ | 156 | test_mesh_api_LDADD = \ |
157 | $(top_builddir)/src/util/libgnunetutil.la \ | 157 | $(top_builddir)/src/util/libgnunetutil.la \ |
158 | $(top_builddir)/src/testing/libgnunettesting.la \ | 158 | $(top_builddir)/src/testing/libgnunettesting.la \ |
159 | $(top_builddir)/src/mesh/libgnunetmesh2.la | 159 | $(top_builddir)/src/mesh/libgnunetmesh.la |
160 | test_mesh_api_DEPENDENCIES = \ | 160 | test_mesh_api_DEPENDENCIES = \ |
161 | libgnunetmesh.la \ | 161 | libgnunetmesh.la \ |
162 | $(top_builddir)/src/util/libgnunetutil.la | 162 | $(top_builddir)/src/util/libgnunetutil.la |
@@ -175,7 +175,7 @@ test_mesh_local_1_SOURCES = \ | |||
175 | test_mesh_local_1_LDADD = \ | 175 | test_mesh_local_1_LDADD = \ |
176 | $(top_builddir)/src/util/libgnunetutil.la \ | 176 | $(top_builddir)/src/util/libgnunetutil.la \ |
177 | $(top_builddir)/src/testing/libgnunettesting.la \ | 177 | $(top_builddir)/src/testing/libgnunettesting.la \ |
178 | $(top_builddir)/src/mesh/libgnunetmesh2.la | 178 | $(top_builddir)/src/mesh/libgnunetmesh.la |
179 | test_mesh_local_1_DEPENDENCIES = \ | 179 | test_mesh_local_1_DEPENDENCIES = \ |
180 | libgnunetmesh.la | 180 | libgnunetmesh.la |
181 | 181 | ||
@@ -184,7 +184,7 @@ test_mesh_local_2_SOURCES = \ | |||
184 | test_mesh_local_2_LDADD = \ | 184 | test_mesh_local_2_LDADD = \ |
185 | $(top_builddir)/src/util/libgnunetutil.la \ | 185 | $(top_builddir)/src/util/libgnunetutil.la \ |
186 | $(top_builddir)/src/testing/libgnunettesting.la \ | 186 | $(top_builddir)/src/testing/libgnunettesting.la \ |
187 | $(top_builddir)/src/mesh/libgnunetmesh2.la | 187 | $(top_builddir)/src/mesh/libgnunetmesh.la |
188 | test_mesh_local_2_DEPENDENCIES = \ | 188 | test_mesh_local_2_DEPENDENCIES = \ |
189 | libgnunetmesh.la | 189 | libgnunetmesh.la |
190 | 190 | ||
diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c index 6b8dc28e9..4f40688f5 100644 --- a/src/mesh/test_mesh_local_1.c +++ b/src/mesh/test_mesh_local_1.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | #include "gnunet_dht_service.h" | 29 | #include "gnunet_dht_service.h" |
30 | #include "gnunet_testing_lib.h" | 30 | #include "gnunet_testing_lib.h" |
31 | #include "gnunet_mesh2_service.h" | 31 | #include "gnunet_mesh_service.h" |
32 | 32 | ||
33 | 33 | ||
34 | static struct GNUNET_MESH_Handle *mesh_peer_1; | 34 | static struct GNUNET_MESH_Handle *mesh_peer_1; |