4 files changed, 20 insertions, 18 deletions

diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 00a312a72..543fed287 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -47,6 +47,7 @@ libgnunetatstesting_la_LIBADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 libgnunetatstesting_la_DEPENDENCIES = \
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index 5afb3f253..f00a5d0f8 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -601,7 +601,8 @@ GNUNET_GNSRECORD_block_get_size (const struct GNUNET_GNSRECORD_Block *block);
  * @return the block expiration.
  */
 struct GNUNET_TIME_Absolute
-GNUNET_GNSRECORD_block_get_expiration (const struct GNUNET_GNSRECORD_Block *block);
+GNUNET_GNSRECORD_block_get_expiration (const struct
+                                       GNUNET_GNSRECORD_Block *block);
 
 
 /**
@@ -643,7 +644,8 @@ GNUNET_GNSRECORD_identity_from_data (const char *data,
  * @return GNUNET_OK if successful.
  */
 enum GNUNET_GenericReturnValue
-GNUNET_GNSRECORD_data_from_identity (const struct GNUNET_IDENTITY_PublicKey *key,
+GNUNET_GNSRECORD_data_from_identity (const struct
+                                     GNUNET_IDENTITY_PublicKey *key,
                                      char **data,
                                      size_t *data_size,
                                      uint32_t *type);
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index ca4d2cb52..2482b97a5 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -127,8 +127,7 @@ typedef void
  */
 struct GNUNET_NAMESTORE_QueueEntry *
 GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h,
-                                const struct
-                                GNUNET_IDENTITY_PrivateKey *pkey,
+                                const struct GNUNET_IDENTITY_PrivateKey *pkey,
                                 const char *label,
                                 unsigned int rd_count,
                                 const struct GNUNET_GNSRECORD_Data *rd,
@@ -314,17 +313,16 @@ struct GNUNET_NAMESTORE_ZoneMonitor;
  * @return handle to stop monitoring
  */
 struct GNUNET_NAMESTORE_ZoneMonitor *
-GNUNET_NAMESTORE_zone_monitor_start (const struct
-                                     GNUNET_CONFIGURATION_Handle *cfg,
-                                     const struct
-                                     GNUNET_IDENTITY_PrivateKey *zone,
-                                     int iterate_first,
-                                     GNUNET_SCHEDULER_TaskCallback error_cb,
-                                     void *error_cb_cls,
-                                     GNUNET_NAMESTORE_RecordMonitor monitor,
-                                     void *monitor_cls,
-                                     GNUNET_SCHEDULER_TaskCallback sync_cb,
-                                     void *sync_cb_cls);
+GNUNET_NAMESTORE_zone_monitor_start (
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const struct GNUNET_IDENTITY_PrivateKey *zone,
+  int iterate_first,
+  GNUNET_SCHEDULER_TaskCallback error_cb,
+  void *error_cb_cls,
+  GNUNET_NAMESTORE_RecordMonitor monitor,
+  void *monitor_cls,
+  GNUNET_SCHEDULER_TaskCallback sync_cb,
+  void *sync_cb_cls);
 
 
 /**
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index a1fe0b8b4..5b81f7295 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -110,15 +110,16 @@ libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  -lm $(Z_LIBS) \
- $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
 libgnunettestbed_la_DEPENDENCIES = \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 libgnunettestbed_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:0:0