diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-05-30 18:35:02 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-05-30 18:35:02 +0000 |
commit | 93fba12ad8159dc6b683f9e7ce9f0528a11047f5 (patch) | |
tree | 73b1bd212c6c5a32adb924d208d8a315b606e854 /src/util/container_meta_data.c | |
parent | cfd880578bd21f9adedba557291c903d325e93cd (diff) | |
download | gnunet-93fba12ad8159dc6b683f9e7ce9f0528a11047f5.tar.gz gnunet-93fba12ad8159dc6b683f9e7ce9f0528a11047f5.zip |
make libextractor actually optional, both for GNUnet and GNUnet-taler builds
Diffstat (limited to 'src/util/container_meta_data.c')
-rw-r--r-- | src/util/container_meta_data.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c index 622b45334..5cef31f37 100644 --- a/src/util/container_meta_data.c +++ b/src/util/container_meta_data.c | |||
@@ -26,7 +26,9 @@ | |||
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | #if HAVE_EXTRACTOR_H | ||
29 | #include <extractor.h> | 30 | #include <extractor.h> |
31 | #endif | ||
30 | #include <zlib.h> | 32 | #include <zlib.h> |
31 | 33 | ||
32 | #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) | 34 | #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) |
@@ -432,7 +434,8 @@ GNUNET_CONTAINER_meta_data_add_publication_date (struct | |||
432 | struct GNUNET_TIME_Absolute t; | 434 | struct GNUNET_TIME_Absolute t; |
433 | 435 | ||
434 | t = GNUNET_TIME_absolute_get (); | 436 | t = GNUNET_TIME_absolute_get (); |
435 | GNUNET_CONTAINER_meta_data_delete (md, EXTRACTOR_METATYPE_PUBLICATION_DATE, | 437 | GNUNET_CONTAINER_meta_data_delete (md, |
438 | EXTRACTOR_METATYPE_PUBLICATION_DATE, | ||
436 | NULL, 0); | 439 | NULL, 0); |
437 | dat = GNUNET_STRINGS_absolute_time_to_string (t); | 440 | dat = GNUNET_STRINGS_absolute_time_to_string (t); |
438 | GNUNET_CONTAINER_meta_data_insert (md, "<gnunet>", | 441 | GNUNET_CONTAINER_meta_data_insert (md, "<gnunet>", |
@@ -481,8 +484,8 @@ GNUNET_CONTAINER_meta_data_iterate (const struct GNUNET_CONTAINER_MetaData *md, | |||
481 | * @return NULL if no entry was found | 484 | * @return NULL if no entry was found |
482 | */ | 485 | */ |
483 | char * | 486 | char * |
484 | GNUNET_CONTAINER_meta_data_get_by_type (const struct GNUNET_CONTAINER_MetaData | 487 | GNUNET_CONTAINER_meta_data_get_by_type (const struct GNUNET_CONTAINER_MetaData *md, |
485 | *md, enum EXTRACTOR_MetaType type) | 488 | enum EXTRACTOR_MetaType type) |
486 | { | 489 | { |
487 | struct MetaItem *pos; | 490 | struct MetaItem *pos; |
488 | 491 | ||