diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-02 20:13:57 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-02 20:13:57 +0200 |
commit | fd9b241cafa715b0da84cdd03f53387082b373f7 (patch) | |
tree | 6a964a8c3b34c466a05f6743202dd60151b47e8d /src | |
parent | 79fa977314009e631112918cce3eb0f0d5f296d7 (diff) | |
download | gnunet-fd9b241cafa715b0da84cdd03f53387082b373f7.tar.gz gnunet-fd9b241cafa715b0da84cdd03f53387082b373f7.zip |
try to fix #6419:
Diffstat (limited to 'src')
-rw-r--r-- | src/block/Makefile.am | 30 | ||||
-rw-r--r-- | src/include/gnunet_common.h | 16 |
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 = \ | |||
23 | plugin_block_template.c | 23 | plugin_block_template.c |
24 | libgnunet_plugin_block_template_la_LIBADD = \ | 24 | libgnunet_plugin_block_template_la_LIBADD = \ |
25 | libgnunetblockgroup.la \ | 25 | libgnunetblockgroup.la \ |
26 | libgnunetblock.la \ | ||
26 | $(top_builddir)/src/util/libgnunetutil.la \ | 27 | $(top_builddir)/src/util/libgnunetutil.la \ |
27 | $(LTLIBINTL) | 28 | $(LTLIBINTL) |
29 | libgnunet_plugin_block_template_la_DEPENDENCIES = \ | ||
30 | libgnunetblockgroup.la \ | ||
31 | libgnunetblock.la \ | ||
32 | $(top_builddir)/src/util/libgnunetutil.la | ||
28 | libgnunet_plugin_block_template_la_LDFLAGS = \ | 33 | libgnunet_plugin_block_template_la_LDFLAGS = \ |
29 | $(GN_PLUGIN_LDFLAGS) | 34 | $(GN_PLUGIN_LDFLAGS) |
30 | 35 | ||
31 | libgnunet_plugin_block_test_la_SOURCES = \ | 36 | libgnunet_plugin_block_test_la_SOURCES = \ |
32 | plugin_block_test.c | 37 | plugin_block_test.c |
33 | libgnunet_plugin_block_test_la_LIBADD = \ | 38 | libgnunet_plugin_block_test_la_LIBADD = \ |
34 | libgnunetblockgroup.la \ | 39 | libgnunetblockgroup.la \ |
35 | $(top_builddir)/src/util/libgnunetutil.la \ | 40 | libgnunetblock.la \ |
41 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
36 | $(LTLIBINTL) | 42 | $(LTLIBINTL) |
43 | libgnunet_plugin_block_test_la_DEPENDENCIES = \ | ||
44 | libgnunetblockgroup.la \ | ||
45 | libgnunetblock.la \ | ||
46 | $(top_builddir)/src/util/libgnunetutil.la | ||
37 | libgnunet_plugin_block_test_la_LDFLAGS = \ | 47 | libgnunet_plugin_block_test_la_LDFLAGS = \ |
38 | $(GN_PLUGIN_LDFLAGS) | 48 | $(GN_PLUGIN_LDFLAGS) |
39 | |||
40 | 49 | ||
41 | libgnunetblock_la_SOURCES = \ | 50 | libgnunetblock_la_SOURCES = \ |
42 | block.c | 51 | block.c |
43 | libgnunetblock_la_LIBADD = \ | 52 | libgnunetblock_la_LIBADD = \ |
44 | $(top_builddir)/src/util/libgnunetutil.la | 53 | $(top_builddir)/src/util/libgnunetutil.la |
45 | libgnunetblock_la_DEPENDENCIES = \ | 54 | libgnunetblock_la_DEPENDENCIES = \ |
46 | $(top_builddir)/src/util/libgnunetutil.la | 55 | $(top_builddir)/src/util/libgnunetutil.la |
47 | libgnunetblock_la_LDFLAGS = \ | 56 | libgnunetblock_la_LDFLAGS = \ |
48 | $(GN_LIB_LDFLAGS) \ | 57 | $(GN_LIB_LDFLAGS) \ |
49 | $(GN_LIBINTL) \ | 58 | $(GN_LIBINTL) \ |
50 | -version-info 0:0:0 | 59 | -version-info 0:0:0 |
51 | 60 | ||
52 | |||
53 | libgnunetblockgroup_la_SOURCES = \ | 61 | libgnunetblockgroup_la_SOURCES = \ |
54 | bg_bf.c | 62 | bg_bf.c |
55 | libgnunetblockgroup_la_LIBADD = \ | 63 | libgnunetblockgroup_la_LIBADD = \ |
56 | libgnunetblock.la \ | 64 | libgnunetblock.la \ |
57 | $(top_builddir)/src/util/libgnunetutil.la | 65 | $(top_builddir)/src/util/libgnunetutil.la |
58 | libgnunetblockgroup_la_DEPENDENCIES = \ | 66 | libgnunetblockgroup_la_DEPENDENCIES = \ |
59 | libgnunetblock.la \ | 67 | libgnunetblock.la \ |
60 | $(top_builddir)/src/util/libgnunetutil.la | 68 | $(top_builddir)/src/util/libgnunetutil.la |
61 | libgnunetblockgroup_la_LDFLAGS = \ | 69 | libgnunetblockgroup_la_LDFLAGS = \ |
62 | $(GN_LIB_LDFLAGS) \ | 70 | $(GN_LIB_LDFLAGS) \ |
63 | $(GN_LIBINTL) \ | 71 | $(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 | |||
345 | * #GNUNET_NO to stop iteration with no error, | 345 | * #GNUNET_NO to stop iteration with no error, |
346 | * #GNUNET_SYSERR to abort iteration with error! | 346 | * #GNUNET_SYSERR to abort iteration with error! |
347 | */ | 347 | */ |
348 | typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename); | 348 | typedef int |
349 | (*GNUNET_FileNameCallback) (void *cls, | ||
350 | const char *filename); | ||
349 | 351 | ||
350 | 352 | ||
351 | /** | 353 | /** |
@@ -353,7 +355,8 @@ typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename); | |||
353 | * | 355 | * |
354 | * @param cls Closure. | 356 | * @param cls Closure. |
355 | */ | 357 | */ |
356 | typedef void (*GNUNET_ContinuationCallback) (void *cls); | 358 | typedef void |
359 | (*GNUNET_ContinuationCallback) (void *cls); | ||
357 | 360 | ||
358 | 361 | ||
359 | /** | 362 | /** |
@@ -368,10 +371,11 @@ typedef void (*GNUNET_ContinuationCallback) (void *cls); | |||
368 | * @param data_size | 371 | * @param data_size |
369 | * Size of @a data. | 372 | * Size of @a data. |
370 | */ | 373 | */ |
371 | typedef void (*GNUNET_ResultCallback) (void *cls, | 374 | typedef void |
372 | int64_t result_code, | 375 | (*GNUNET_ResultCallback) (void *cls, |
373 | const void *data, | 376 | int64_t result_code, |
374 | uint16_t data_size); | 377 | const void *data, |
378 | uint16_t data_size); | ||
375 | 379 | ||
376 | 380 | ||
377 | /* ****************************** logging ***************************** */ | 381 | /* ****************************** logging ***************************** */ |