Use appconfig.h instead of cfg/config.h.

[bertos.git] / mware / hashtable.c

diff --git a/mware/hashtable.c b/mware/hashtable.c
index 5122fb587b7ee265a35729c00e84279f5ec7b11c..bfc8bc0ec6a0b1510be0fb5aba68bbe8a583ee34 100755 (executable)
--- a/mware/hashtable.c
+++ b/mware/hashtable.c
@@ -61,6 +61,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.5  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.4  2004/12/08 09:42:30  bernie
+ *#* Suppress warning.
+ *#*
  *#* Revision 1.3  2004/10/03 20:43:22  bernie
  *#* Import changes from sc/firmware.
  *#*
@@ -92,8 +98,8 @@
  *#*/
 
 #include "hashtable.h"
-#include <debug.h>
-#include <compiler.h>
+#include <cfg/debug.h>
+#include <cfg/compiler.h>
 
 #include <string.h>
 
@@ -224,7 +230,7 @@ static bool insert(struct HashTable* ht, const void* key, uint8_t key_length, co
                return false;
 
        if (HT_HAS_INTERNAL_KEY(ht))
-               key_length = MIN(key_length, INTERNAL_KEY_MAX_LENGTH);
+               key_length = MIN(key_length, (uint8_t)INTERNAL_KEY_MAX_LENGTH);
 
        node = perform_lookup(ht, key, key_length);
        if (!node)
@@ -286,7 +292,7 @@ const void* ht_find(struct HashTable* ht, const void* key, uint8_t key_length)
        HashNodePtr node;
 
        if (HT_HAS_INTERNAL_KEY(ht))
-               key_length = MIN(key_length, INTERNAL_KEY_MAX_LENGTH);
+               key_length = MIN(key_length, (uint8_t)INTERNAL_KEY_MAX_LENGTH);
 
        node = perform_lookup(ht, key, key_length);