Prep v221: Update and clean up build system to sync with upstream

[elogind.git] / src / basic / hashmap.h

diff --git a/src/shared/hashmap.h b/src/basic/hashmap.h
similarity index 99%
rename from src/shared/hashmap.h
rename to src/basic/hashmap.h
index 5723f09ca9134c117652439d92426ccf8b5efadc..03c8ae1c52d22512975d1ba008d9f1918ba66940 100644 (file)
--- a/src/shared/hashmap.h
+++ b/src/basic/hashmap.h
@@ -65,7 +65,6 @@ typedef struct {
 } Iterator;
 
 #define _IDX_ITERATOR_FIRST (UINT_MAX - 1)
-#define _IDX_ITERATOR_NIL (UINT_MAX)
 #define ITERATOR_FIRST ((Iterator) { .idx = _IDX_ITERATOR_FIRST, .next_key = NULL })
 
 typedef unsigned long (*hash_func_t)(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]);
@@ -370,7 +369,7 @@ static inline void *ordered_hashmap_first(OrderedHashmap *h) {
 }
 
 /* no hashmap_next */
-void *ordered_hashmap_next(OrderedHashmap *h, const void *key);
+// UNNEEDED void *ordered_hashmap_next(OrderedHashmap *h, const void *key);
 
 char **internal_hashmap_get_strv(HashmapBase *h);
 static inline char **hashmap_get_strv(Hashmap *h) {