X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fstruct%2Fhashtable.h;h=9a102a8a9ce9a35327540f94be9470f45159e66f;hb=cb5ac008ef47b00966b573c2df2c1eeacf452b98;hp=e59548cd73134c044fbc4f24f0acb0d64d301146;hpb=56bc36208843a05a8879f31a1b1a6bcb0f1de176;p=bertos.git

diff --git a/bertos/struct/hashtable.h b/bertos/struct/hashtable.h
index e59548cd..9a102a8a 100644
--- a/bertos/struct/hashtable.h
+++ b/bertos/struct/hashtable.h
@@ -30,6 +30,8 @@
  * Copyright 2004 Giovanni Bajo
  * -->
  *
+ * \author Giovanni Bajo <rasky@develer.com>
+ *
  * \brief Portable hash table
  *
  * This file implements a portable hash table, with the following features:
@@ -48,23 +50,19 @@
  * a marker for a free node, so it is invalid to store a NULL pointer in the table
  * with \c ht_insert().
  *
- * \version $Id$
- * \author Giovanni Bajo <rasky@develer.com>
+ * $WIZ$ module_name = "hashtable"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_hashtable.h"
  */
 
-#ifndef MWARE_HASHTABLE_H
-#define MWARE_HASHTABLE_H
+#ifndef STRUCT_HASHTABLE_H
+#define STRUCT_HASHTABLE_H
+
+#include "cfg/cfg_hashtable.h"
 
 #include <cfg/compiler.h>
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 
-/**
- * Enable/disable support to declare special hash tables which maintain a copy of
- * the key internally instead of relying on the hook to extract it from the data.
- */
-#define CONFIG_HT_OPTIONAL_INTERNAL_KEY      1
-
 /// Maximum length of the internal key (use (2^n)-1 for slight speedup)
 #define INTERNAL_KEY_MAX_LENGTH     15
 
@@ -151,7 +149,7 @@ typedef struct
  * \param ht Hash table declared with \c DECLARE_HASHTABLE
  *
  * \note This function must be called before using the hash table. Optionally,
- * it can be called later in the program to clear the hash table, 
+ * it can be called later in the program to clear the hash table,
  * removing all its elements.
  */
 void ht_init(struct HashTable* ht);
@@ -268,4 +266,4 @@ INLINE HashIterator ht_iter_next(HashIterator h)
 	return h;
 }
 
-#endif /* MWARE_HASHTABLE_H */
+#endif /* STRUCT_HASHTABLE_H */