From: Nathan S. Evans <evans@in.tum.de>
Date: Tue, 31 Aug 2010 14:09:50 +0000 (+0000)
Subject: broken dht compilation fix
X-Git-Tag: initial-import-from-subversion-38251~20500
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=789666b489d86a209676511af74e810c92585151;p=oweals%2Fgnunet.git

broken dht compilation fix
---

diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index e35ad1b74..19946d6f7 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -171,6 +171,21 @@ void GNUNET_CONTAINER_bloomfilter_clear (struct GNUNET_CONTAINER_BloomFilter
 int GNUNET_CONTAINER_bloomfilter_or (struct GNUNET_CONTAINER_BloomFilter *bf,
                                      const char *data, size_t size);
 
+/**
+ * Or the entries of the given raw data array with the
+ * data of the given bloom filter.  Assumes that
+ * the size of the data array and the current filter
+ * match.
+ *
+ * @param bf the filter
+ * @param to_or the bloomfilter to or-in
+ * @param size number of bytes in data
+ */
+int
+GNUNET_CONTAINER_bloomfilter_or2 (struct GNUNET_CONTAINER_BloomFilter *bf,
+                                  const struct GNUNET_CONTAINER_BloomFilter *to_or,
+                                  size_t size);
+
 /**
  * Resize a bloom filter.  Note that this operation
  * is pretty costly.  Essentially, the bloom filter
@@ -498,7 +513,7 @@ enum GNUNET_CONTAINER_MultiHashMapOption
  *         GNUNET_NO if not.
  */
 typedef int (*GNUNET_CONTAINER_HashMapIterator) (void *cls,
-						 const GNUNET_HashCode * key,
+                                                 const GNUNET_HashCode * key,
                                                  void *value);