Index: generic/include/adt/hash_table.h
===================================================================
--- generic/include/adt/hash_table.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ generic/include/adt/hash_table.h	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -56,5 +56,5 @@
 	 * @return Index into hash table.
 	 */
-	index_t (* hash)(__native key[]);
+	index_t (* hash)(unative_t key[]);
 	
 	/** Hash table item comparison function.
@@ -64,5 +64,5 @@
 	 * @return true if the keys match, false otherwise.
 	 */
-	bool (*compare)(__native key[], count_t keys, link_t *item);
+	bool (*compare)(unative_t key[], count_t keys, link_t *item);
 
 	/** Hash table item removal callback.
@@ -76,7 +76,7 @@
 
 extern void hash_table_create(hash_table_t *h, count_t m, count_t max_keys, hash_table_operations_t *op);
-extern void hash_table_insert(hash_table_t *h, __native key[], link_t *item);
-extern link_t *hash_table_find(hash_table_t *h, __native key[]);
-extern void hash_table_remove(hash_table_t *h, __native key[], count_t keys);
+extern void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item);
+extern link_t *hash_table_find(hash_table_t *h, unative_t key[]);
+extern void hash_table_remove(hash_table_t *h, unative_t key[], count_t keys);
 
 #endif