summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-02 20:13:57 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-02 20:13:57 +0200
commitfd9b241cafa715b0da84cdd03f53387082b373f7 (patch)
tree6a964a8c3b34c466a05f6743202dd60151b47e8d
parent79fa977314009e631112918cce3eb0f0d5f296d7 (diff)
try to fix #6419:
-rw-r--r--src/block/Makefile.am30
-rw-r--r--src/include/gnunet_common.h16
2 files changed, 29 insertions, 17 deletions
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index dd596f6b4..ceeff4c66 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -23,41 +23,49 @@ libgnunet_plugin_block_template_la_SOURCES = \
plugin_block_template.c
libgnunet_plugin_block_template_la_LIBADD = \
libgnunetblockgroup.la \
+ libgnunetblock.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL)
+libgnunet_plugin_block_template_la_DEPENDENCIES = \
+ libgnunetblockgroup.la \
+ libgnunetblock.la \
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_block_template_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
+ $(GN_PLUGIN_LDFLAGS)
libgnunet_plugin_block_test_la_SOURCES = \
plugin_block_test.c
libgnunet_plugin_block_test_la_LIBADD = \
libgnunetblockgroup.la \
-$(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetblock.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL)
+libgnunet_plugin_block_test_la_DEPENDENCIES = \
+ libgnunetblockgroup.la \
+ libgnunetblock.la \
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_block_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
+ $(GN_PLUGIN_LDFLAGS)
libgnunetblock_la_SOURCES = \
block.c
libgnunetblock_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunetblock_la_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunetblock_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
$(GN_LIBINTL) \
-version-info 0:0:0
-
libgnunetblockgroup_la_SOURCES = \
bg_bf.c
libgnunetblockgroup_la_LIBADD = \
- libgnunetblock.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetblock.la \
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunetblockgroup_la_DEPENDENCIES = \
- libgnunetblock.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetblock.la \
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunetblockgroup_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
$(GN_LIBINTL) \
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 34f419a49..68993b51d 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -345,7 +345,9 @@ struct GNUNET_AsyncScopeSave
* #GNUNET_NO to stop iteration with no error,
* #GNUNET_SYSERR to abort iteration with error!
*/
-typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename);
+typedef int
+(*GNUNET_FileNameCallback) (void *cls,
+ const char *filename);
/**
@@ -353,7 +355,8 @@ typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename);
*
* @param cls Closure.
*/
-typedef void (*GNUNET_ContinuationCallback) (void *cls);
+typedef void
+(*GNUNET_ContinuationCallback) (void *cls);
/**
@@ -368,10 +371,11 @@ typedef void (*GNUNET_ContinuationCallback) (void *cls);
* @param data_size
* Size of @a data.
*/
-typedef void (*GNUNET_ResultCallback) (void *cls,
- int64_t result_code,
- const void *data,
- uint16_t data_size);
+typedef void
+(*GNUNET_ResultCallback) (void *cls,
+ int64_t result_code,
+ const void *data,
+ uint16_t data_size);
/* ****************************** logging ***************************** */